From b18c72626bbb8670b7488f2931230eb6efecbc41 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@citrix.com>
Date: Thu, 18 Jul 2013 21:53:51 -0700
Subject: [PATCH] Moved the SprintUtils which is for testing only to be in test
 directory.  Changed pom.xml for different projects to use the utils test-jar.
  Removed some @Component annotations.  Moved majority of the dependencies
 from cloudstack pom to utils pom

---
 agent/pom.xml                                 | 14 ------
 awsapi/pom.xml                                |  5 ++
 .../rest/service/api/ClusterRestService.java  |  4 --
 .../rest/service/api/NetworkRestService.java  |  4 --
 .../rest/service/api/PodRestService.java      |  4 --
 .../api/VirtualMachineRestService.java        |  4 --
 .../rest/service/api/VolumeRestService.java   |  4 --
 .../rest/service/api/ZoneRestService.java     |  4 --
 .../subsystem/api/storage/type/DataDisk.java  |  4 +-
 .../subsystem/api/storage/type/Iso.java       |  4 +-
 .../subsystem/api/storage/type/RootDisk.java  |  4 +-
 .../api/storage/type/VolumeTypeHelper.java    |  3 --
 .../datastore/db/PrimaryDataStoreDaoImpl.java |  5 --
 .../cloudstack/storage/image/format/ISO.java  |  2 -
 plugins/event-bus/rabbitmq/pom.xml            |  1 -
 plugins/pom.xml                               | 48 ++++++++++---------
 pom.xml                                       | 26 ----------
 server/pom.xml                                | 14 +++++-
 usage/pom.xml                                 | 15 +++---
 utils/pom.xml                                 | 23 ++++++++-
 .../cloudstack/test/utils/SpringUtils.java    |  0
 21 files changed, 76 insertions(+), 116 deletions(-)
 rename utils/{src => test}/org/apache/cloudstack/test/utils/SpringUtils.java (100%)

diff --git a/agent/pom.xml b/agent/pom.xml
index c2b1502728f..9a59518b870 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -43,21 +43,7 @@
     </dependency>    
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.7</version>
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index bcae07218c2..2fe208912d5 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -32,6 +32,11 @@
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>    
     <dependency>
       <groupId>org.apache.axis2</groupId>
       <artifactId>axis2</artifactId>
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
index 2718e2fdbc8..9ed686fff86 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java
@@ -30,11 +30,7 @@ import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
 import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Component
-@Service("ClusterRestService")
 @Produces("application/json")
 public class ClusterRestService {
 //    @Inject
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
index b75600e08fe..82dc833a9b8 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java
@@ -29,11 +29,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Service("NetworkRestService")
-@Component
 @Produces("application/json")
 public class NetworkRestService {
     @PUT @Path("/network/create")
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
index 9c009b9aea2..73f84bbfa43 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java
@@ -28,11 +28,7 @@ import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity;
 import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Component
-@Service("PodService")
 @Produces({"application/json"})
 public class PodRestService {
 //  @Inject
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
index f3f7bad1936..f793de00db9 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java
@@ -28,11 +28,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Component
-@Service("VirtualMachineRestService")
 @Produces("application/xml")
 public class VirtualMachineRestService {
 
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
index cb1a0d3dc47..ff8b0a44aa0 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java
@@ -30,11 +30,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Component
-@Service("VolumeRestService")
 @Produces("application/json")
 public class VolumeRestService {
 
diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
index bd6980e064a..8eb662a3394 100755
--- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
+++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java
@@ -31,11 +31,7 @@ import javax.ws.rs.QueryParam;
 
 import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity;
 import org.apache.cloudstack.engine.service.api.ProvisioningService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
-@Component
-@Service("zoneService")
 @Produces({"application/json"})
 public class ZoneRestService {
 //    @Inject
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java
index a533f55d31c..f94cb2e5a77 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/DataDisk.java
@@ -16,11 +16,9 @@
 // under the License.
 package org.apache.cloudstack.engine.subsystem.api.storage.type;
 
-import org.springframework.stereotype.Component;
 
-@Component
 public class DataDisk extends VolumeTypeBase {
     public DataDisk() {
-        this.type = "DataDisk";
+        type = "DataDisk";
     }
 }
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java
index 85c62725597..f94c4b58eeb 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/Iso.java
@@ -16,11 +16,9 @@
 // under the License.
 package org.apache.cloudstack.engine.subsystem.api.storage.type;
 
-import org.springframework.stereotype.Component;
 
-@Component
 public class Iso extends VolumeTypeBase {
     public Iso() {
-        this.type = "iso";
+        type = "iso";
     }
 }
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java
index e8f4ce5c128..6e094d3a035 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/RootDisk.java
@@ -16,11 +16,9 @@
 // under the License.
 package org.apache.cloudstack.engine.subsystem.api.storage.type;
 
-import org.springframework.stereotype.Component;
 
-@Component
 public class RootDisk extends VolumeTypeBase {
     public RootDisk() {
-        this.type = "Root";
+        type = "Root";
     }
 }
diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java
index 6dc2cd48c3d..50572033042 100644
--- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java
+++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/type/VolumeTypeHelper.java
@@ -20,9 +20,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.springframework.stereotype.Component;
-
-@Component
 public class VolumeTypeHelper {
     static private List<VolumeType> types;
     private static VolumeType defaultType = new Unknown();
diff --git a/engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index 96e18fc6277..1032526f10e 100644
--- a/engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ b/engine/api/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -28,14 +28,10 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.springframework.stereotype.Component;
-
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.StoragePoolStatus;
-
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
@@ -48,7 +44,6 @@ import com.cloud.utils.db.SearchCriteriaService;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@Component
 @Local(value = { PrimaryDataStoreDao.class })
 @DB(txn = false)
 public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long> implements PrimaryDataStoreDao {
diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java b/engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java
index 2f01a276187..c2c1d931aa5 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/image/format/ISO.java
@@ -19,9 +19,7 @@
 package org.apache.cloudstack.storage.image.format;
 
 import org.apache.cloudstack.storage.BaseType;
-import org.springframework.stereotype.Component;
 
-@Component
 public class ISO extends BaseType implements ImageFormat {
     private final String type = "ISO";
 
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index bd4d0977c04..30dee37f523 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -41,6 +41,5 @@
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
   </build>
 </project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 261e8e8fcc5..ff1e9c9c78d 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to you under 
+  the Apache License, Version 2.0 (the "License"); you may not use this file except 
+  in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+  Unless required by applicable law or agreed to in writing, software distributed under 
+  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific language 
+  governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloudstack-plugins</artifactId>
   <name>Apache CloudStack Plugin POM</name>
@@ -26,16 +19,15 @@
     <artifactId>cloudstack</artifactId>
     <version>4.2.0-SNAPSHOT</version>
   </parent>
+
   <build>
     <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
   </build>
   <modules>
     <module>api/rate-limit</module>
     <module>api/discovery</module>
     <module>acl/static-role-based</module>
-	  <module>affinity-group-processors/host-anti-affinity</module>
+    <module>affinity-group-processors/host-anti-affinity</module>
     <module>affinity-group-processors/explicit-dedication</module>
     <module>deployment-planners/user-concentrated-pod</module>
     <module>deployment-planners/user-dispersing</module>
@@ -78,6 +70,18 @@
       <artifactId>cloud-server</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>      
+    </dependency>
   </dependencies>
 
   <profiles>
@@ -158,6 +162,6 @@
       <modules>
         <module>hypervisors/simulator</module>
       </modules>
-     </profile>
+    </profile>
   </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index ff1d3c03c4c..ed951515ed7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
   </issueManagement>
 
   <properties>
-    <!--skipTests>true</skipTests -->
     <cs.jdk.version>1.6</cs.jdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -197,16 +196,6 @@
       <artifactId>spring-core</artifactId>
       <version>${org.springframework.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${org.springframework.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -219,21 +208,6 @@
       <version>${org.springframework.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.7.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-      <version>1.7.1</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/server/pom.xml b/server/pom.xml
index 497e4c984a8..56b0402f2c1 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -23,6 +23,11 @@
       <artifactId>commons-io</artifactId>
       <version>${cs.commons-io.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-core</artifactId>
@@ -80,6 +85,11 @@
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.reflections</groupId>
       <artifactId>reflections</artifactId>
@@ -87,8 +97,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-engine-api</artifactId>
+      <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>      
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
diff --git a/usage/pom.xml b/usage/pom.xml
index e35d0ebf485..af08f535294 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -26,6 +26,13 @@
     <version>4.2.0-SNAPSHOT</version>
   </parent>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>      
+    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-server</artifactId>
@@ -44,14 +51,6 @@
     </dependency>
   </dependencies>
   <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-      <testResources>
-          <testResource>
-              <directory>test/resources</directory>
-          </testResource>
-      </testResources>
     <resources>
       <resource>
           <directory>resources</directory>
diff --git a/utils/pom.xml b/utils/pom.xml
index 63bcbabb6dd..fb723dcccc7 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -26,7 +26,28 @@
     <version>4.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <dependencies>
+  <dependencies>  
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${org.springframework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.7.1</version>
+    </dependency>    
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/utils/src/org/apache/cloudstack/test/utils/SpringUtils.java b/utils/test/org/apache/cloudstack/test/utils/SpringUtils.java
similarity index 100%
rename from utils/src/org/apache/cloudstack/test/utils/SpringUtils.java
rename to utils/test/org/apache/cloudstack/test/utils/SpringUtils.java