Updated Branches: refs/heads/bvt 6d2068feb -> 8e89939be
separate the simulatorContext from regular client context componentContext.xml.in is for oss components. Removing the simulator context out of it. simulatorComponentContext.xml.in is activated by the -Dsimulator property from the developer profile. $ mvn -Pdeveloper -Dsimulator clean install This will use the simulator beans that will be required for the integration-test. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e89939b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e89939b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e89939b Branch: refs/heads/bvt Commit: 8e89939be19c00ff175b8d7318b17df77d3e5ace Parents: 6d2068f Author: Prasanna Santhanam <[email protected]> Authored: Sun Mar 24 16:38:35 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sun Mar 24 16:38:35 2013 +0530 ---------------------------------------------------------------------- client/pom.xml | 52 +++++++++------ client/tomcatconf/componentContext.xml.in | 4 - client/tomcatconf/simulatorComponentContext.xml.in | 23 ++++++- 3 files changed, 52 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e89939b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 1052a38..f183b46 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -220,11 +220,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-plugin-hypervisor-simulator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-volume-default</artifactId> <version>${project.version}</version> @@ -386,22 +381,22 @@ </target> </configuration> </execution> - <execution> - <id>process-nonoss</id> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target if="${nonoss}"> - <echo>test</echo> - <replaceregexp - file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties" - match="cloud-stack-components-specification=.*" - replace="cloud-stack-components-specification=components-nonoss.xml" byline="true" /> - </target> - </configuration> - </execution> + <execution> + <id>process-nonoss</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="${nonoss}"> + <echo>test</echo> + <replaceregexp + file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties" + match="cloud-stack-components-specification=.*" + replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"/> + </target> + </configuration> + </execution> <execution> <id>process-simulator-context</id> <phase>process-resources</phase> @@ -507,6 +502,21 @@ </build> <profiles> <profile> + <id>developer</id> + <activation> + <property> + <name>simulator</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-plugin-hypervisor-simulator</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>netapp</id> <activation> <property> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e89939b/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 0ad56a3..1052d9e 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -207,10 +207,6 @@ <property name="name" value="XCP Agent"/> </bean> - <bean id="SimulatorSecondaryStorageDiscoverer" class="com.cloud.resource.SimulatorSecondaryDiscoverer"> - <property name="name" value="SecondaryStorage"/> - </bean> - <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"> <property name="name" value="SecondaryStorage"/> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e89939b/client/tomcatconf/simulatorComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/simulatorComponentContext.xml.in b/client/tomcatconf/simulatorComponentContext.xml.in index 8df51c6..fceefc8 100644 --- a/client/tomcatconf/simulatorComponentContext.xml.in +++ b/client/tomcatconf/simulatorComponentContext.xml.in @@ -36,10 +36,26 @@ --> <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> <bean id="encryptionSecretKeyChecker" class="com.cloud.utils.crypt.EncryptionSecretKeyChecker" /> - - <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" /> <bean id="configurationServerImpl" class="com.cloud.server.ConfigurationServerImpl" /> + <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl" > + <property name="UserAuthenticators"> + <list> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + </list> + </property> + </bean> + + <bean id ="AccountManagerImpl" class="com.cloud.user.AccountManagerImpl"> + <property name="UserAuthenticators"> + <list> + <ref bean="MD5UserAuthenticator"/> + <ref bean="LDAPUserAuthenticator"/> + </list> + </property> + </bean> + <bean id="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> <bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" /> <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" /> @@ -248,4 +264,7 @@ <property name="name" value="SimulatorGuru"/> </bean> + <bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl"> + </bean> + </beans>
