You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/10/15 22:29:48 UTC
[47/50] [abbrv] git commit: add nonoss maven build
add nonoss maven build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/77d8ad01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/77d8ad01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/77d8ad01
Branch: refs/heads/junit-tests
Commit: 77d8ad014a160a4191f21f0d336f0b4d76eb86f6
Parents: 470d18d
Author: Edison Su <ed...@citrix.com>
Authored: Thu Oct 11 01:15:52 2012 -0700
Committer: Chip Childers <ch...@gmail.com>
Committed: Mon Oct 15 16:19:13 2012 -0400
----------------------------------------------------------------------
build/replace.properties | 2 +-
client/pom.xml | 228 ++++++++++++-----------
client/tomcatconf/components-nonoss.xml.in | 94 ++++++++++
plugins/hypervisors/vmware/pom.xml | 12 +-
vmware-base/pom.xml | 6 +
5 files changed, 232 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d8ad01/build/replace.properties
----------------------------------------------------------------------
diff --git a/build/replace.properties b/build/replace.properties
index 8cd0fa3..c9a93c2 100644
--- a/build/replace.properties
+++ b/build/replace.properties
@@ -24,6 +24,6 @@ DBHOST=localhost
AGENTLOGDIR=logs
AGENTLOG=logs/agent.log
MSMNTDIR=/mnt
-COMPONENTS-SPEC=components-premium.xml
+COMPONENTS-SPEC=components.xml
AWSAPILOG=awsapi.log
REMOTEHOST=localhost
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d8ad01/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0a13876..e98257a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1,22 +1,15 @@
-<!--
- 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>cloud-client-ui</artifactId>
<name>Apache CloudStack Client UI</name>
@@ -145,43 +138,66 @@
<version>1.7</version>
<executions>
<execution>
+ <id>generate-resource</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
- <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+ <copy
+ todir="${basedir}/target/generated-webapp/WEB-INF/classes">
<fileset dir="${basedir}/WEB-INF/classes">
<include name="resources/**/*" />
</fileset>
</copy>
- <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+ <copy
+ todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
<fileset dir="${basedir}/../scripts" />
</copy>
<copy todir="${basedir}/target/generated-webapp">
<fileset dir="${basedir}/../ui" />
</copy>
- <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
+ <copy overwrite="true"
+ todir="${basedir}/target/generated-webapp/WEB-INF/classes">
<fileset dir="${basedir}/tomcatconf">
<include name="*.in" />
</fileset>
<globmapper from="*.in" to="*" />
<filterchain>
- <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile" value="${basedir}/../build/replace.properties" />
+ <filterreader
+ classname="org.apache.tools.ant.filters.ReplaceTokens">
+ <param type="propertiesfile"
+ value="${basedir}/../build/replace.properties" />
</filterreader>
</filterchain>
</copy>
</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>
</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.-->
+ <!--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>
@@ -214,85 +230,85 @@
</pluginManagement>
</build>
<profiles>
- <profile>
- <id>netapp</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-netapp</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>f5</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-network-f5</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>netscaler</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-network-netscaler</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>srx</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-network-srx</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>vmware</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-vmware-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <profile>
+ <id>netapp</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-netapp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>f5</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-network-f5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>netscaler</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-network-netscaler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>srx</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-network-srx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>vmware</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-vmware-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d8ad01/client/tomcatconf/components-nonoss.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/components-nonoss.xml.in b/client/tomcatconf/components-nonoss.xml.in
new file mode 100755
index 0000000..e31506d
--- /dev/null
+++ b/client/tomcatconf/components-nonoss.xml.in
@@ -0,0 +1,94 @@
+<?xml version="1.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.
+-->
+<!--
+ components.xml is the configuration file for the VM Ops
+ insertion servers. Someone can quickly pull together an
+ insertion server by selecting the correct adapters to use.
+
+ Here are some places to look for information.
+ - To find out the general functionality that each Manager
+ or Adapter provide, look at the javadoc for the interface
+ that it implements. The interface is usually the
+ "key" attribute in the declaration.
+ - To find specific implementation of each Manager or
+ Adapter, look at the javadoc for the actual class. The
+ class can be found in the <class> element.
+ - To find out the configuration parameters for each Manager
+ or Adapter, look at the javadoc for the actual implementation
+ class. It should be documented in the description of the
+ class.
+ - To know more about the components.xml in general, look for
+ the javadoc for ComponentLocator.java.
+
+ If you found that the Manager or Adapter are not properly
+ documented, please contact the author.
+-->
+<components-nonoss.xml>
+ <system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker">
+ <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/>
+ <checker name="PremiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/>
+ </system-integrity-checker>
+
+ <management-server class="com.cloud.server.ManagementServerExtImpl" library="com.cloud.configuration.PremiumComponentLibrary" extends="components.xml:management-server">
+ <adapters key="com.cloud.ha.Investigator">
+ <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/>
+ </adapters>
+
+ <adapters key="com.cloud.ha.FenceBuilder">
+ <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/>
+ </adapters>
+
+ <adapters key="com.cloud.resource.Discoverer">
+ <adapter name="VShpereServer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer"/>
+ </adapters>
+
+ <adapters key="com.cloud.network.element.NetworkElement">
+ <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
+ <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/>
+ <adapter name="F5BigIP" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
+ <adapter name="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement"/>
+ </adapters>
+
+ <adapters key="com.cloud.hypervisor.HypervisorGuru">
+ <adapter name="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"/>
+ </adapters>
+
+ <manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/>
+ <manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
+ <pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/>
+ <pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
+ <pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
+ <pluggableservice name="CiscoNexusVSMElementService" key="com.cloud.network.element.CiscoNexusVSMElementService" class="com.cloud.network.element.CiscoNexusVSMElement"/>
+
+ <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/>
+ <dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/>
+ <dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
+ <dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
+ <dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
+ </management-server>
+ <configuration-server class="com.cloud.server.ConfigurationServerImpl" extends="components.xml:configuration-server">
+ <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
+ <param name="premium">true</param>
+ </dao>
+ </configuration-server>
+
+
+
+</components-nonoss.xml>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d8ad01/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 81d8dc1..9f1939c 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -36,19 +36,25 @@
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim</artifactId>
<version>1.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim25</artifactId>
<version>1.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-apputils</artifactId>
<version>1.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-lib-jaxrpc</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d8ad01/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 32f9d3f..e2bba78 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -56,6 +56,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-lib-jaxrpc</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>${cs.axis.version}</version>