simulator: removing cyclic dependency from simulator The database creator caused a cyclic dependecny in the simulator which is removed with this commit. Additionally the simulator profile is now merged with developer profile and a test for server health is included
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ee602be Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ee602be Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ee602be Branch: refs/heads/master Commit: 7ee602beaf85643c643d878e52f77e8c9bbcabb1 Parents: 8e917b1 Author: Prasanna Santhanam <t...@apache.org> Authored: Sun Mar 10 21:07:29 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Tue Apr 2 18:31:29 2013 +0530 ---------------------------------------------------------------------- client/pom.xml | 25 +-- client/tomcatconf/componentContext.xml.in | 428 +++++++++++++++--------- pom.xml | 230 ++++---------- 3 files changed, 327 insertions(+), 356 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ee602be/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 61cda76..7565029 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -67,16 +67,6 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-plugin-syslog-alerts</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-plugin-snmp-alerts</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-ovs</artifactId> <version>${project.version}</version> </dependency> @@ -101,6 +91,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-plugin-hypervisor-ucs</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-ovm</artifactId> <version>${project.version}</version> @@ -224,16 +219,6 @@ <artifactId>cloud-plugin-hypervisor-simulator</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-plugin-hypervisor-ucs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-plugin-storage-volume-default</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ee602be/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index fea1d0f..d5714ea 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -30,192 +30,286 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + <!-- - OSS deployment component configuration + Compose a CloudStack deployment with selected components here --> <bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" /> - <bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl" /> + <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="clusterManagerImpl" class="com.cloud.cluster.ClusterManagerImpl" /> + <bean id="clusteredAgentManagerImpl" class="com.cloud.agent.manager.ClusteredAgentManagerImpl" /> + <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" /> + <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" /> + <bean id="userVmManagerImpl" class="com.cloud.vm.UserVmManagerImpl" /> + <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="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" /> + <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" /> + + <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/> + <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/> + <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/> + <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/> + <bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl" /> + <bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl" /> + <bean id="UcsManager" class="com.cloud.ucs.manager.UcsManagerImpl" /> + <bean id="UcsBladeDao" class="com.cloud.ucs.database.UcsBladeDaoImpl" /> + <bean id="UcsManagerDao" class="com.cloud.ucs.database.UcsManagerDaoImpl" /> + + + <!-- + Network Elements + --> + <bean id="Ovs" class="com.cloud.network.element.OvsElement"> + <property name="name" value="Ovs"/> + </bean> + <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> + <property name="name" value="BareMetalDhcp"/> + </bean> + <bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement"> + <property name="name" value="BareMetalPxe"/> + </bean> + <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement"> + <property name="name" value="BareMetalUserdata"/> + </bean> + <bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement"> + <property name="name" value="SecurityGroupProvider"/> + </bean> + <bean id="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"> + <property name="name" value="VirtualRouter"/> + </bean> + <bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"> + <property name="name" value="VpcVirtualRouter"/> + </bean> + <!-- + <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"> + <property name="name" value="NiciraNvp"/> + </bean> + --> - <!-- - Managers & pluggable adapters configuration under OSS deployment +<!-- + <bean id="BigSwitchVnsElementService" class="com.cloud.network.element.BigSwitchVnsElement"> + <property name="name" value="BigSwitchVnsElementService"/> + </bean> +--> + + <!-- + Adapters --> - <bean id="accountManagerImpl" class="com.cloud.user.AccountManagerImpl" > - <property name="UserAuthenticators"> - <list> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - </list> - </property> - <property name="SecurityCheckers"> - <list> - <ref bean="domainChecker"/> - </list> - </property> + <bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator"> + <property name="name" value="FirstFitRouting"/> </bean> - <bean id="managementServerImpl" class ="com.cloud.server.ManagementServerImpl"> - <property name="UserAuthenticators"> - <list> - <ref bean="MD5UserAuthenticator"/> - <ref bean="LDAPUserAuthenticator"/> - </list> - </property> - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> - </list> - </property> - </bean> - - <bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl"> - <property name="StoragePoolAllocators"> - <list> - <ref bean="LocalStoragePoolAllocator"/> - <ref bean="clusterScopeStoragePoolAllocator"/> - <ref bean="zoneWideStoragePoolAllocator"/> - <ref bean="garbageCollectingStoragePoolAllocator"/> - </list> - </property> + <bean id="hypervisorTemplateAdapter" class="com.cloud.template.HypervisorTemplateAdapter"> + <property name="name" value="HypervisorAdapter"/> + </bean> + + <bean id="bareMetalTemplateAdapter" class="com.cloud.baremetal.BareMetalTemplateAdapter"> + <property name="name" value="BareMetalAdapter"/> + </bean> + + <!-- + Storage pool allocators + --> + + <bean id="LocalStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator"> + <property name="name" value="LocalStorage"/> + </bean> + <!-- + <bean id="FirstFitStoragePoolAllocator" class="org.apache.cloudstack.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="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/> + + <bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator"> + <property name="name" value="Basic"/> + </bean> + + <bean id="HypervisorTemplateAdapter" class="com.cloud.template.HypervisorTemplateAdapter"> + <property name="name" value="HypervisorAdapter"/> + </bean> + + <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" > + <property name="name" value="BareMetalTemplateAdapter"/> + </bean> + + <!-- + Authenticators + --> + <bean id="MD5UserAuthenticator" class="com.cloud.server.auth.MD5UserAuthenticator"> + <property name="name" value="MD5"/> + </bean> + + <bean id="LDAPUserAuthenticator" class="com.cloud.server.auth.LDAPUserAuthenticator"> + <property name="name" value="LDAP"/> + </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="OvmFencer" class="com.cloud.ovm.hypervisor.OvmFencer"> + <property name="name" value="OvmFenceBuilder"/> + </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="SimulatorDiscoverer" class="com.cloud.resource.SimulatorDiscoverer"> + <property name="name" value="Simulator Agent"/> + </bean> + + + <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> + <property name="name" value="Bare Metal Agent"/> + </bean> + + <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"> + <property name="name" value="SCVMMServer"/> + </bean> + + <bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer"> + <property name="name" value="Ovm Discover"/> </bean> <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner"> <property name="name" value="First Fit"/> - <property name="StoragePoolAllocators"> - <list> - <ref bean="LocalStoragePoolAllocator"/> - <ref bean="clusterScopeStoragePoolAllocator"/> - <ref bean="zoneWideStoragePoolAllocator"/> - <ref bean="garbageCollectingStoragePoolAllocator"/> - </list> - </property> - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> - </list> - </property> + </bean> + + <bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner"> + <property name="name" value="UserDispersing"/> </bean> - <bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" > - <property name="PodAllocators"> - <list> - <ref bean="UserConcentratedAllocator"/> - </list> - </property> - <property name="Discoverers"> - <list> - <ref bean="XcpServerDiscoverer"/> - <ref bean="SecondaryStorageDiscoverer"/> - <ref bean="KvmServerDiscoverer"/> - <ref bean="LxcServerDiscoverer"/> - + <bean id="UserConcentratedPodPlanner" class="com.cloud.deploy.UserConcentratedPodPlanner"> + <property name="name" value="UserConcentratedPod"/> + </bean> + + <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> + <property name="name" value="BareMetal Fit"/> + </bean> + + <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector"> + <property name="name" value="BaremetalPlannerSelector"/> + </bean> + + <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector"> + <property name="name" value="HypervisorPlannerSelector"/> + </bean> + + <!-- - <ref bean="BareMetalDiscoverer"/> + Network Gurus --> - - <ref bean="OvmDiscoverer"/> - </list> - </property> - </bean> - - <bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" > - <property name="Investigators"> - <list> - <ref bean="CheckOnAgentInvestigator"/> - <ref bean="XenServerInvestigator"/> - <ref bean="UserVmDomRInvestigator"/> - <ref bean="ManagementIPSystemVMInvestigator"/> - </list> - </property> - <property name="FenceBuilders"> - <list> - <ref bean="XenServerFencer"/> - <ref bean="KVMFencer"/> - <ref bean="OvmFencer"/> - </list> - </property> - </bean> - - <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" > - <property name="HostAllocators"> - <list> - <ref bean="FirstFitRouting"/> - </list> - </property> - <property name="Planners"> - <list> - <ref bean="FirstFitPlanner" /> - <ref bean="UserDispersingPlanner" /> - <ref bean="UserConcentratedPodPlanner" /> - -<!-- - <ref bean="BareMetalPlanner" /> ---> - - </list> - </property> + <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="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru"> + <property name="name" value="NiciraNvpGuestNetworkGuru"/> </bean> - <bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" > - <property name="NetworkGurus"> - <list> - <ref bean="StorageNetworkGuru"/> - <ref bean="ExternalGuestNetworkGuru"/> - <ref bean="PublicNetworkGuru"/> - <ref bean="PodBasedNetworkGuru"/> - <ref bean="DirectPodBasedNetworkGuru"/> - <ref bean="ControlNetworkGuru"/> - <ref bean="DirectNetworkGuru"/> - <ref bean="OvsGuestNetworkGuru"/> - <ref bean="PrivateNetworkGuru"/> - </list> - </property> - <property name="NetworkElements"> - <list> - <ref bean="VirtualRouter"/> - <ref bean="Ovs"/> - <ref bean="SecurityGroupProvider"/> - <ref bean="VpcVirtualRouter"/> -<!-- - <ref bean="BareMetalDhcp"/> - <ref bean="BareMetalPxe"/> - <ref bean="BareMetalUserdata"/> +<!-- + <bean id="BigSwitchVnsGuestNetworkGuru" class=".BigSwitchVnsGuestNetworkGuru"> + <property name="name" value="com.cloud.network.guru.BigSwitchVnsGuestNetworkGuru"/> + </bean> --> - </list> - </property> - <property name="IpDeployers"> - <list> - <ref bean="elasticLoadBalancerElement"/> - <ref bean="VirtualRouter"/> - <ref bean="VpcVirtualRouter"/> - </list> - </property> - <property name="DhcpProviders"> - <list> - <ref bean="VirtualRouter"/> - <ref bean="VpcVirtualRouter"/> -<!-- - <ref bean="BareMetalDhcp"/> ---> - </list> - </property> - </bean> - - <bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl"> - <property name="NetworkElements"> - <list> - <ref bean="VirtualRouter"/> - <ref bean="Ovs"/> - <ref bean="SecurityGroupProvider"/> - <ref bean="VpcVirtualRouter"/> -<!-- - <ref bean="BareMetalDhcp"/> - <ref bean="BareMetalPxe"/> - <ref bean="BareMetalUserdata"/> ---> - </list> - </property> + + <!-- + Hypervisor Gurus + --> + <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"> + <property name="name" value="XenServerGuru"/> </bean> - <bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" /> + <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru"> + <property name="name" value="KVMGuru"/> + </bean> + + <bean id="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"> + <property name="name" value="HypervGuru"/> + </bean> + + <bean id="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru"> + <property name="name" value="OvmGuru"/> + </bean> + + <bean id="SimulatorGuru" class="com.cloud.simulator.SimulatorGuru"> + <property name="name" value="SimulatorGuru"/> + </bean> + + <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> + <property name="name" value="BaremetalGuru"/> + </bean> </beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ee602be/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0393d0c..5e5f624 100644 --- a/pom.xml +++ b/pom.xml @@ -174,11 +174,11 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${cs.mysql.version}</version> - </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${cs.mysql.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -188,12 +188,12 @@ <artifactId>junit</artifactId> <version>${cs.junit.version}</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${org.springframework.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${org.springframework.version}</version> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> @@ -205,17 +205,17 @@ <version>${org.springframework.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${org.springframework.version}</version> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${org.springframework.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> @@ -227,9 +227,9 @@ <version>1.7.1</version> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> </dependency> </dependencies> @@ -260,7 +260,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> @@ -390,41 +390,41 @@ <configuration> <source>${cs.jdk.version}</source> <target>${cs.jdk.version}</target> - <fork>true</fork> - <meminitial>128m</meminitial> - <maxmem>512m</maxmem> - <compilerArgument>-XDignore.symbol.file=true</compilerArgument> + <fork>true</fork> + <meminitial>128m</meminitial> + <maxmem>512m</maxmem> + <compilerArgument>-XDignore.symbol.file=true</compilerArgument> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + </archive> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>remove-old-installers</id> - <goals> - <goal>remove-project-artifact</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <id>remove-old-installers</id> + <goals> + <goal>remove-project-artifact</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -453,9 +453,9 @@ </profile> <profile> <id>developer</id> - <properties> - <marvin.config>tools/devcloud/devcloud.cfg</marvin.config> - </properties> + <properties> + <marvin.config>tools/devcloud/devcloud.cfg</marvin.config> + </properties> <modules> <module>developer</module> <module>tools</module> @@ -472,113 +472,5 @@ <module>vmware-base</module> </modules> </profile> - <profile> - <id>simulator</id> - <activation> - <property> - <name>deploydb-simulator</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-2</version> - <executions> - <execution> - <phase>initialize</phase> - <goals> - <goal>read-project-properties</goal> - </goals> - <configuration> - <files> - <file>${project.basedir}/utils/conf/db.properties</file> - <file>${project.basedir}/utils/conf/db.properties.override</file> - </files> - <quiet>true</quiet> - </configuration> - </execution> - </executions> - </plugin> - <!-- DatabaseCreator driver here --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <dependencies> - <!-- specify the dependent jdbc driver here --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${cs.mysql.version}</version> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>${cs.dbcp.version}</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>${cs.pool.version}</version> - </dependency> - <dependency> - <groupId>org.jasypt</groupId> - <artifactId>jasypt</artifactId> - <version>${cs.jasypt.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-server</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <phase>process-resources</phase> - <id>create-schema</id> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <includeProjectDependencies>false</includeProjectDependencies> - <includePluginDependencies>true</includePluginDependencies> - <executableDependency> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-server</artifactId> - </executableDependency> - <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass> - <arguments> - <!-- db properties file --> - <argument>${project.basedir}/utils/conf/db.properties</argument> - <argument>${project.basedir}/utils/conf/db.properties.override</argument> - <!-- simulator sql files --> - <argument>${basedir}/target/db/create-schema-simulator.sql</argument> - <argument>${basedir}/target/db/templates.simulator.sql</argument> - <!-- database upgrade--> - <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument> - <argument>--database=simulator</argument> - <argument>--rootpassword=${db.root.password}</argument> - <!-- enable verbosity by -v or dash-dash-verbose --> - </arguments> - <systemProperties> - <systemProperty> - <key>catalina.home</key> - <value>${project.basedir}/utils</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
