Updated Branches: refs/heads/master 72c46103a -> 1834e8147
Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f7c558d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f7c558d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f7c558d Branch: refs/heads/master Commit: 3f7c558de5ae684d62fd1e525444dfc4e10a8efd Parents: 72c4610 Author: Alex Huang <[email protected]> Authored: Fri Jul 26 15:38:27 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Fri Jul 26 16:34:08 2013 -0700 ---------------------------------------------------------------------- engine/orchestration/pom.xml | 12 -- engine/service/pom.xml | 6 - engine/storage/cache/pom.xml | 12 -- engine/storage/datamotion/pom.xml | 10 - engine/storage/image/pom.xml | 16 -- engine/storage/integration-test/pom.xml | 17 -- .../resource/StorageAllocatorTestContext.xml | 45 ----- .../test/resource/component.xml | 192 ------------------- .../test/resource/s3_testng.xml | 47 ----- .../test/resource/storageContext.xml | 91 --------- .../integration-test/test/resource/testng.xml | 53 ----- engine/storage/pom.xml | 10 - engine/storage/snapshot/pom.xml | 19 -- .../resource/SnapshotManagerTestContext.xml | 42 ---- engine/storage/volume/pom.xml | 13 -- framework/ipc/pom.xml | 8 - plugins/api/discovery/pom.xml | 8 - plugins/api/rate-limit/pom.xml | 8 - plugins/hypervisors/ucs/pom.xml | 39 ++-- plugins/hypervisors/xen/pom.xml | 6 - plugins/network-elements/midonet/pom.xml | 6 - pom.xml | 6 + server/pom.xml | 1 - utils/pom.xml | 5 - 24 files changed, 18 insertions(+), 654 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/orchestration/pom.xml ---------------------------------------------------------------------- diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index c98373a..2ad6f00 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -53,21 +53,9 @@ <artifactId>cloud-server</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/service/pom.xml ---------------------------------------------------------------------- diff --git a/engine/service/pom.xml b/engine/service/pom.xml index 47c0edc..b581296 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -31,12 +31,6 @@ <url>http://www.cloudstack.org</url> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-api</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/cache/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml index f00f6cd..58dd5b1 100644 --- a/engine/storage/cache/pom.xml +++ b/engine/storage/cache/pom.xml @@ -31,20 +31,8 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/datamotion/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml index 8a3698c..7306c0e 100644 --- a/engine/storage/datamotion/pom.xml +++ b/engine/storage/datamotion/pom.xml @@ -43,16 +43,6 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/image/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml index c4d2d1b..c5eef5e 100644 --- a/engine/storage/image/pom.xml +++ b/engine/storage/image/pom.xml @@ -31,21 +31,5 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> - </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index d082710..40436d4 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -129,16 +129,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>6.1.1</version> @@ -147,13 +137,6 @@ </dependencies> <build> - <defaultGoal>install</defaultGoal> - <testSourceDirectory>${project.basedir}/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.basedir}/test/resource</directory> - </testResource> - </testResources> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/test/resource/StorageAllocatorTestContext.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resource/StorageAllocatorTestContext.xml b/engine/storage/integration-test/test/resource/StorageAllocatorTestContext.xml deleted file mode 100644 index 1f5aa58..0000000 --- a/engine/storage/integration-test/test/resource/StorageAllocatorTestContext.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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. --> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - - <context:annotation-config /> - <context:component-scan base-package="org.apache.cloudstack.storage" /> - - - <!-- @DB support --> - <aop:config proxy-target-class="true"> - <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder"> - <aop:pointcut id="captureAnyMethod" expression="execution(* *(..))" /> - - <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod" /> - </aop:aspect> - - </aop:config> - - <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> - <bean id="componentContext" class="com.cloud.utils.component.ComponentContext"/> - <bean class="org.apache.cloudstack.storage.test.ChildTestConfiguration" /> - - <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"> - <property name="requiredParameterValue" value="false" /> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/test/resource/component.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resource/component.xml b/engine/storage/integration-test/test/resource/component.xml deleted file mode 100644 index d7fe903..0000000 --- a/engine/storage/integration-test/test/resource/component.xml +++ /dev/null @@ -1,192 +0,0 @@ -<!-- - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; - xmlns:tx="http://www.springframework.org/schema/tx"; - xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - - - <!-- - Compose a CloudStack deployment with selected components here - --> - <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> - - <bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" /> - <bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" /> - - <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> - <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" /> - <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" /> - <bean id="bareMetalVmManagerImpl" class="com.cloud.baremetal.BareMetalVmManagerImpl" /> - <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl" /> - <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" /> - <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" /> - <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" /> - - - <!-- - Adapters - --> - <bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"> - <property name="name" value="FirstFitRouting"/> - </bean> - - <!-- - Storage pool allocators - --> - <bean id="LocalStoragePoolAllocator" class="com.cloud.storage.allocator.LocalStoragePoolAllocator"> - <property name="name" value="LocalStorage"/> - </bean> - <bean id="FirstFitStoragePoolAllocator" class="com.cloud.storage.allocator.FirstFitStoragePoolAllocator"> - <property name="name" value="Storage"/> - </bean> - - <bean id="UserConcentratedAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"> - <property name="name" value="User First"/> - </bean> - - <bean id="ConsoleProxyAllocator" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator"> - <property name="name" value="Balance"/> - </bean> - - - <bean id="ExternalIpAddressAllocator" class="com.cloud.network.ExternalIpAddressAllocator"> - <property name="name" value="Basic"/> - </bean> - - <!-- - Investigators - --> - <bean id="CheckOnAgentInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"> - <property name="name" value="SimpleInvestigator"/> - </bean> - - <bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"> - <property name="name" value="XenServerInvestigator"/> - </bean> - - <bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"> - <property name="name" value="PingInvestigator"/> - </bean> - - <bean id="ManagementIPSystemVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"> - <property name="name" value="ManagementIPSysVMInvestigator"/> - </bean> - - <!-- - Fencers - --> - <bean id="XenServerFencer" class="com.cloud.ha.XenServerFencer"> - <property name="name" value="XenServerFenceBuilder"/> - </bean> - <bean id="KVMFencer" class="com.cloud.ha.KVMFencer"> - <property name="name" value="KVMFenceBuilder"/> - </bean> - - - <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"> - <property name="name" value="XCP Agent"/> - </bean> - - <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"> - <property name="name" value="SecondaryStorage"/> - </bean> - - <bean id="KvmServerDiscoverer" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"> - <property name="name" value="KVM Agent"/> - </bean> - - <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.BareMetalDiscoverer"> - <property name="name" value="Bare Metal Agent"/> - </bean> - - <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner"> - <property name="name" value="First Fit"/> - </bean> - - - <bean id="BareMetalPlanner" class="com.cloud.deploy.BareMetalPlanner"> - <property name="name" value="BareMetal Fit"/> - </bean> - - - <!-- - Network Gurus - --> - <bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru"> - <property name="name" value="StorageNetworkGuru"/> - </bean> - <bean id="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru"> - <property name="name" value="ExternalGuestNetworkGuru"/> - </bean> - <bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru"> - <property name="name" value="PublicNetworkGuru"/> - </bean> - <bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru"> - <property name="name" value="PodBasedNetworkGuru"/> - </bean> - <bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru"> - <property name="name" value="ControlNetworkGuru"/> - </bean> - <bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru"> - <property name="name" value="DirectNetworkGuru"/> - </bean> - <bean id="DirectPodBasedNetworkGuru" class="com.cloud.network.guru.DirectPodBasedNetworkGuru"> - <property name="name" value="DirectPodBasedNetworkGuru"/> - </bean> - <bean id="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru"> - <property name="name" value="OvsGuestNetworkGuru"/> - </bean> - <bean id="PrivateNetworkGuru" class="com.cloud.network.guru.PrivateNetworkGuru"> - <property name="name" value="PrivateNetworkGuru"/> - </bean> - <bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"> - <property name="name" value="VpcVirtualRouter"/> - </bean> - <!-- - Hypervisor Gurus - --> - <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"> - <property name="name" value="XenServerGuru"/> - </bean> - - <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru"> - <property name="name" value="KVMGuru"/> - </bean> - - <bean id="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru"> - <property name="name" value="BareMetalGuru"/> - </bean> - - <!-- - DAO with customized configuration - --> - <bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl"> - </bean> - -</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/test/resource/s3_testng.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resource/s3_testng.xml b/engine/storage/integration-test/test/resource/s3_testng.xml deleted file mode 100644 index 017cc9b..0000000 --- a/engine/storage/integration-test/test/resource/s3_testng.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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. ---> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";> -<suite thread-count="1" verbose="1" name="storage test" annotations="JDK" parallel="classes"> - <!--describe your test environment--> - <parameter name="devcloud-host-ip" value="192.168.56.2"/> - <parameter name="devcloud-host-gateway" value="192.168.56.1"/> - <parameter name="devcloud-host-cidr" value="192.168.56.0/24"/> - <parameter name="template-url" value="http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2"/> - <parameter name="primary-storage-want-to-add" value="nfs://192.168.56.2/opt/storage/primarynfs"/> - <parameter name="devcloud-local-storage-uuid" value="cd10cac1-4772-92e5-5da6-c2bc16b1ce1b"/> - <parameter name="devcloud-host-uuid" value="759ee4c9-a15a-297b-67c6-ac267d8aa429"/> - <parameter name="devcloud-secondary-storage" value="nfs://192.168.56.10/opt/storage/secondary"/> - - <parameter name="s3-accesskey" value="OYAZXCAFUC1DAFOXNJWI"/> - <parameter name="s3-secretkey" value="YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ=="/> - <parameter name="s3-endpoint" value="10.223.89.7:8080" /> - <parameter name="s3-template-bucket" value="s3://cstemplates"/> - <parameter name="s3-usehttps" value="false" /> - - <listeners> - <listener class-name="org.apache.cloudstack.storage.test.TestNGAop" /> - </listeners> - - <test name="integration-tests"> - <packages> - <package name="org.apache.cloudstack.storage.test"/> - </packages> - </test> -</suite> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/test/resource/storageContext.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resource/storageContext.xml b/engine/storage/integration-test/test/resource/storageContext.xml deleted file mode 100644 index f9c891a..0000000 --- a/engine/storage/integration-test/test/resource/storageContext.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?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. --> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - <context:annotation-config /> - - <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" /> - <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> - <bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" /> -<bean class="org.apache.cloudstack.storage.test.ChildTestConfiguration" /> - <bean id="instantiatePostProcessor" class="com.cloud.utils.component.ComponentInstantiationPostProcessor"> - <property name="Interceptors"> - <list> - <ref bean="transactionContextBuilder" /> - <ref bean="actionEventInterceptor" /> - </list> - </property> - </bean> - -<bean id="imageStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl" /> - <bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.image.db.ImageStoreDetailsDaoImpl" /> - <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.SnapshotDataStoreDaoImpl" /> - <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" /> - <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" /> - <bean id="objectInDataStoreDaoImpl" class="org.apache.cloudstack.storage.db.ObjectInDataStoreDaoImpl" /> - <bean id="primaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" /> - <bean id="primaryDataStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.volume.db.PrimaryDataStoreDetailsDaoImpl" /> - <bean id="templatePrimaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.volume.db.TemplatePrimaryDataStoreDaoImpl" /> - <bean id="LocalStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator"/> - <bean id="clusterScopeStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.ClusterScopeStoragePoolAllocator" /> - <bean id="zoneWideStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.ZoneWideStoragePoolAllocator" /> - <bean id="garbageCollectingStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.GarbageCollectingStoragePoolAllocator"/> - <bean id="dataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.provider.DataStoreProviderManagerImpl" /> - <bean id="ancientDataMotionStrategy" class="org.apache.cloudstack.storage.motion.AncientDataMotionStrategy" /> - <bean id="storageCacheManagerImpl" class="org.apache.cloudstack.storage.cache.manager.StorageCacheManagerImpl" /> - <bean id="storageCacheRandomAllocator" class="org.apache.cloudstack.storage.cache.allocator.StorageCacheRandomAllocator" /> - <bean id="xenserverSnapshotStrategy" class="org.apache.cloudstack.storage.snapshot.XenserverSnapshotStrategy" /> - <bean id="bAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" /> - <bean id="dataMotionServiceImpl" class="org.apache.cloudstack.storage.motion.DataMotionServiceImpl" /> - <bean id="dataObjectManagerImpl" class="org.apache.cloudstack.storage.datastore.DataObjectManagerImpl" /> - <bean id="dataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.DataStoreManagerImpl" /> - <bean id="primaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" /> - <bean id="imageStoreProviderManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageStoreProviderManagerImpl" /> - <bean id="iSCSI" class="org.apache.cloudstack.storage.datastore.type.ISCSI" /> - <bean id="ISO" class="org.apache.cloudstack.storage.image.format.ISO" /> - <bean id="templateDataFactoryImpl" class="org.apache.cloudstack.storage.image.TemplateDataFactoryImpl" /> - <bean id="imageDataManagerImpl" class="org.apache.cloudstack.storage.image.manager.ImageDataManagerImpl" /> - <bean id="imageStoreHelper" class="org.apache.cloudstack.storage.image.datastore.ImageStoreHelper" /> - <bean id="imageFormatHelper" class="org.apache.cloudstack.storage.image.format.ImageFormatHelper" /> - <bean id="templateServiceImpl" class="org.apache.cloudstack.storage.image.TemplateServiceImpl" /> - <bean id="networkFileSystem" class="org.apache.cloudstack.storage.datastore.type.NetworkFileSystem" /> - <bean id="OVA" class="org.apache.cloudstack.storage.image.format.OVA" /> - <bean id="objectInDataStoreManagerImpl" class="org.apache.cloudstack.storage.datastore.ObjectInDataStoreManagerImpl" /> - <bean id="primaryDataStoreHelper" class="org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper" /> - <bean id="QCOW2" class="org.apache.cloudstack.storage.image.format.QCOW2" /> - <bean id="snapshotDataFactoryImpl" class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl" /> - <bean id="snapshotServiceImpl" class="org.apache.cloudstack.storage.snapshot.SnapshotServiceImpl" /> - <bean id="snapshotStateMachineManagerImpl" class="org.apache.cloudstack.storage.snapshot.SnapshotStateMachineManagerImpl" /> - <bean id="unknown" class="org.apache.cloudstack.storage.image.format.Unknown" /> - <bean id="VHD" class="org.apache.cloudstack.storage.image.format.VHD" /> - <bean id="volumeDataFactoryImpl" class="org.apache.cloudstack.storage.volume.VolumeDataFactoryImpl" /> - <bean id="volumeServiceImpl" class="org.apache.cloudstack.storage.volume.VolumeServiceImpl" /> - <bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl" /> - <bean id="cloudStackImageStoreProviderImpl" class="org.apache.cloudstack.storage.datastore.provider.CloudStackImageStoreProviderImpl" /> - <bean id="s3ImageStoreProviderImpl" class="org.apache.cloudstack.storage.datastore.provider.S3ImageStoreProviderImpl" /> - <bean id="swiftImageStoreProviderImpl" class="org.apache.cloudstack.storage.datastore.provider.SwiftImageStoreProviderImpl" /> - <bean id="simulatorImageStoreProviderImpl" class="org.apache.cloudstack.storage.datastore.provider.SimulatorImageStoreProviderImpl" /> - <bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" /> - <bean id="storagePoolAutomationImpl" class="com.cloud.storage.StoragePoolAutomationImpl" /> - <bean id="AccountGuestVlanMapDaoImpl" class="com.cloud.network.dao.AccountGuestVlanMapDaoImpl" /> - <bean id="StorageCacheReplacementAlgorithm" class="org.apache.cloudstack.storage.cache.manager.StorageCacheReplacementAlgorithmLRU" /> - <bean id="ServiceOfferingDetailsDao" class="com.cloud.service.dao.ServiceOfferingDetailsDaoImpl" /> -</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/integration-test/test/resource/testng.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resource/testng.xml b/engine/storage/integration-test/test/resource/testng.xml deleted file mode 100644 index fb43309..0000000 --- a/engine/storage/integration-test/test/resource/testng.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?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. ---> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";> -<suite thread-count="1" verbose="1" name="storage test" annotations="JDK" parallel="classes"> - <!--describe your test environment--> - <parameter name="devcloud-host-ip" value="192.168.56.2"/> - <parameter name="devcloud-host-gateway" value="192.168.56.1"/> - <parameter name="devcloud-host-cidr" value="192.168.56.0/24"/> - <parameter name="template-url" value="http://192.168.56.10:8080/ce5b212e-215a-3461-94fb-814a635b2215.vhd"/> - <parameter name="primary-storage-want-to-add" value="nfs://192.168.56.2/opt/storage/primarynfs"/> - <parameter name="devcloud-local-storage-uuid" value="cd10cac1-4772-92e5-5da6-c2bc16b1ce1b"/> - <parameter name="devcloud-host-uuid" value="759ee4c9-a15a-297b-67c6-ac267d8aa429"/> - <parameter name="devcloud-secondary-storage" value="nfs://192.168.56.10/opt/storage/secondary"/> - <parameter name="primary-storage-uuid-want-to-add" value="759ee4c9-a15a-297b-67c6-ac267d8abe29" /> - <parameter name="script-path" value="/Users/minc/dev/cloud-asf" /> - - - <parameter name="s3-accesskey" value="OYAZXCAFUC1DAFOXNJWI"/> - <parameter name="s3-secretkey" value="YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ=="/> - <parameter name="s3-endpoint" value="10.223.89.7:8080" /> - <parameter name="s3-template-bucket" value="cloudstack"/> - <parameter name="s3-usehttps" value="false" /> - - <parameter name="image-install-path" value="template/tmpl/1/5/"/> - - - <listeners> - <listener class-name="org.apache.cloudstack.storage.test.TestNGAop" /> - </listeners> - - <test name="integration-tests"> - <packages> - <package name="org.apache.cloudstack.storage.test"/> - </packages> - </test> -</suite> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml index cc56116..ee52d22 100644 --- a/engine/storage/pom.xml +++ b/engine/storage/pom.xml @@ -61,16 +61,6 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/snapshot/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml index 350a9a9..6c476a8 100644 --- a/engine/storage/snapshot/pom.xml +++ b/engine/storage/snapshot/pom.xml @@ -36,24 +36,5 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <testSourceDirectory>${project.basedir}/test</testSourceDirectory> - <testResources> - <testResource> - <directory>${project.basedir}/test/resource</directory> - </testResource> - </testResources> - </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/snapshot/test/resource/SnapshotManagerTestContext.xml ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/test/resource/SnapshotManagerTestContext.xml b/engine/storage/snapshot/test/resource/SnapshotManagerTestContext.xml deleted file mode 100644 index d99c2e2..0000000 --- a/engine/storage/snapshot/test/resource/SnapshotManagerTestContext.xml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- 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. --> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; - xmlns:tx="http://www.springframework.org/schema/tx"; xmlns:aop="http://www.springframework.org/schema/aop"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - - <context:annotation-config /> - - <!-- @DB support --> - <aop:config proxy-target-class="true"> - <aop:aspect id="dbContextBuilder" ref="transactionContextBuilder"> - <aop:pointcut id="captureAnyMethod" expression="execution(* *(..))" /> - - <aop:around pointcut-ref="captureAnyMethod" method="AroundAnyMethod" /> - </aop:aspect> - - </aop:config> - - <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" /> - <bean id="componentContext" class="com.cloud.utils.component.ComponentContext"/> - <bean id="TestConfiguration" - class="com.cloud.network.security.SecurityGroupManagerTestConfiguration" /> - <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"> - <property name="requiredParameterValue" value="false" /> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/engine/storage/volume/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml index 19357ab..e861126 100644 --- a/engine/storage/volume/pom.xml +++ b/engine/storage/volume/pom.xml @@ -31,21 +31,8 @@ <version>${cs.mysql.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> </dependencies> <build> - <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/framework/ipc/pom.xml ---------------------------------------------------------------------- diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml index 2c2131f..b8c2774 100644 --- a/framework/ipc/pom.xml +++ b/framework/ipc/pom.xml @@ -36,12 +36,4 @@ <version>${project.version}</version> </dependency> </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <testResources> - <testResource> - <directory>${project.basedir}/test/resources</directory> - </testResource> - </testResources> - </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/plugins/api/discovery/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml index 5d9ad75..3b48b42 100644 --- a/plugins/api/discovery/pom.xml +++ b/plugins/api/discovery/pom.xml @@ -42,14 +42,6 @@ </dependency> </dependencies> <build> - <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> - <testResources> - <testResource> - <directory>test/resources</directory> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/plugins/api/rate-limit/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml index 5645f0b..49cc574 100644 --- a/plugins/api/rate-limit/pom.xml +++ b/plugins/api/rate-limit/pom.xml @@ -27,14 +27,6 @@ <relativePath>../../pom.xml</relativePath> </parent> <build> - <defaultGoal>install</defaultGoal> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> - <testResources> - <testResource> - <directory>test/resources</directory> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/plugins/hypervisors/ucs/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml index 24bdc94..fcfa505 100755 --- a/plugins/hypervisors/ucs/pom.xml +++ b/plugins/hypervisors/ucs/pom.xml @@ -1,25 +1,16 @@ -<!-- - 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 +<!-- 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 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.cloudstack</groupId> @@ -37,12 +28,6 @@ </properties> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/plugins/hypervisors/xen/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index 72d32f3..5ef9bd8 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -40,12 +40,6 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>xapi</artifactId> <version>${cs.xapi.version}</version> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/plugins/network-elements/midonet/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/midonet/pom.xml b/plugins/network-elements/midonet/pom.xml index bfd59a9..154999b 100644 --- a/plugins/network-elements/midonet/pom.xml +++ b/plugins/network-elements/midonet/pom.xml @@ -40,12 +40,6 @@ <version>12.12.2</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-kvm</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 74c1ceb..6296f37 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,7 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${cs.mysql.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> @@ -207,6 +208,11 @@ <version>${org.springframework.version}</version> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.9.5</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 20bcece..f5617b9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -119,7 +119,6 @@ </dependency> </dependencies> <build> - <defaultGoal>install</defaultGoal> <resources> <resource> <directory>resources</directory> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f7c558d/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 686afdd..cb18fc2 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -33,11 +33,6 @@ <version>${org.springframework.version}</version> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency>
