From 8a3943b7632eddf3856a19e7d9a3fee82dd325be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= <rafaelweingartner@gmail.com>
Date: Thu, 15 Mar 2018 23:34:22 -0300
Subject: [PATCH] CLOUDSTACK-10132: Fix POM of "agent-lb" project (#2491)

Post fwd merging, this fixes build issues.
---
 .../java}/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java | 0
 .../org/apache/cloudstack/agent/lb/SetupMSListCommand.java      | 0
 framework/agent-lb/pom.xml                                      | 2 +-
 .../java}/org/apache/cloudstack/agent/lb/IndirectAgentLB.java   | 0
 .../apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java    | 0
 .../apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java  | 0
 .../agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java  | 0
 .../agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java     | 0
 .../agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java      | 0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename core/src/{ => main/java}/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java (100%)
 rename core/src/{ => main/java}/org/apache/cloudstack/agent/lb/SetupMSListCommand.java (100%)
 rename framework/agent-lb/src/{ => main/java}/org/apache/cloudstack/agent/lb/IndirectAgentLB.java (100%)
 rename framework/agent-lb/src/{ => main/java}/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java (100%)
 rename server/src/{ => main/java}/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java (100%)
 rename server/src/{ => main/java}/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java (100%)
 rename server/src/{ => main/java}/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java (100%)
 rename server/src/{ => main/java}/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java (100%)

diff --git a/core/src/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java b/core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
similarity index 100%
rename from core/src/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
rename to core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListAnswer.java
diff --git a/core/src/org/apache/cloudstack/agent/lb/SetupMSListCommand.java b/core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
similarity index 100%
rename from core/src/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
rename to core/src/main/java/org/apache/cloudstack/agent/lb/SetupMSListCommand.java
diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml
index 7d14a3a4a7e..8f16f2b085d 100644
--- a/framework/agent-lb/pom.xml
+++ b/framework/agent-lb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>cloudstack-framework</artifactId>
         <groupId>org.apache.cloudstack</groupId>
-        <version>4.11.1.0-SNAPSHOT</version>
+        <version>4.12.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLB.java b/framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
similarity index 100%
rename from framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
rename to framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLB.java
diff --git a/framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java b/framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
similarity index 100%
rename from framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
rename to framework/agent-lb/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java b/server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java
diff --git a/server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java b/server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java
similarity index 100%
rename from server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java
rename to server/src/main/java/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java