Get rid of a few errors and warnings in the engine storage integration-test sources
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54a3d804 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54a3d804 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54a3d804 Branch: refs/heads/rbac Commit: 54a3d8048b887796ac470c2a2238f5503ccabb6e Parents: a5caa10 Author: Hugo Trippaers <[email protected]> Authored: Mon Nov 4 17:19:47 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Nov 4 20:01:13 2013 +0100 ---------------------------------------------------------------------- engine/storage/integration-test/pom.xml | 33 ++++++++++++++++++++ .../test/resources/storageContext.xml | 3 -- 2 files changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54a3d804/engine/storage/integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index dc4065e..4e5fdeb 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -185,5 +185,38 @@ </executions> </plugin> </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.apache.maven.plugins + </groupId> + <artifactId> + maven-antrun-plugin + </artifactId> + <versionRange>[1.7,)</versionRange> + <goals> + <goal>run</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54a3d804/engine/storage/integration-test/test/resources/storageContext.xml ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/resources/storageContext.xml b/engine/storage/integration-test/test/resources/storageContext.xml index 0dcd6a8..c984515 100644 --- a/engine/storage/integration-test/test/resources/storageContext.xml +++ b/engine/storage/integration-test/test/resources/storageContext.xml @@ -85,10 +85,7 @@ <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" /> -<<<<<<< HEAD <bean id="storageStrategyFactoryImpl" class="org.apache.cloudstack.storage.helper.StorageStrategyFactoryImpl" /> -======= <bean id="vmsnapshotDetailsDao" class="com.cloud.vm.snapshot.dao.VMSnapshotDetailsDaoImpl" /> <bean id="snapshotManager" class="com.cloud.storage.snapshot.SnapshotManagerImpl" /> ->>>>>>> pluggable_vm_snapshot </beans>
