apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up the pom.xml to use dependencies specified in cloudstack pom

Browse Source
This commit is contained in:
Alex Huang 2013-08-02 13:22:01 -07:00
parent afd5d555f6
commit 66cca4d9ac
20 changed files with 121 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/pom.xml
View File

@ -39,14 +39,12 @@
<dependency> <dependency>
<groupId>commons-daemon</groupId> <groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId> <artifactId>commons-daemon</artifactId>
<version>${cs.daemon.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>generate-resource</id> <id>generate-resource</id>
@ -98,7 +96,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>

2
api/pom.xml
View File

@ -34,7 +34,6 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -44,7 +43,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

2
client/pom.xml
View File

@ -289,7 +289,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>ru.concerteza.buildnumber</groupId> <groupId>ru.concerteza.buildnumber</groupId>
@ -560,7 +559,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version>
<executions> <executions>
<execution> <execution>
<id>copy</id> <id>copy</id>

7
core/pom.xml
View File

@ -36,13 +36,6 @@
<artifactId>cloud-engine-api</artifactId> <artifactId>cloud-engine-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!--
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-schema</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>

5
developer/pom.xml
View File

@ -25,23 +25,19 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
<version>${cs.dbcp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jasypt</groupId> <groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId> <artifactId>jasypt</artifactId>
<version>${cs.jasypt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -55,7 +51,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>

2
framework/events/pom.xml
View File

@ -27,12 +27,10 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${cs.guava.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
framework/ipc/pom.xml
View File

@ -23,12 +23,10 @@
<dependency> <dependency>
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>${cs.cglib.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>

3
framework/rest/pom.xml
View File

@ -28,9 +28,6 @@
<artifactId>cloud-framework-rest</artifactId> <artifactId>cloud-framework-rest</artifactId>
<name>Apache CloudStack Framework - REST</name> <name>Apache CloudStack Framework - REST</name>
<build> <build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>

2
plugins/alert-handlers/snmp-alerts/pom.xml
View File

@ -33,12 +33,10 @@
<dependency> <dependency>
<groupId>org.apache.servicemix.bundles</groupId> <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
<version>2.1.0_1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

1
plugins/alert-handlers/syslog-alerts/pom.xml
View File

@ -33,7 +33,6 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

5
plugins/hypervisors/vmware/pom.xml
View File

@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-storage</artifactId> <artifactId>cloud-engine-storage</artifactId>
<version>4.3.0-SNAPSHOT</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -52,17 +52,14 @@
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId> <artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId> <artifactId>axis-jaxrpc</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>wsdl4j</groupId> <groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId> <artifactId>wsdl4j</artifactId>
<version>1.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

1
plugins/network-elements/f5/pom.xml
View File

@ -35,7 +35,6 @@
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId> <artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

1
plugins/network-elements/juniper-srx/pom.xml
View File

@ -35,7 +35,6 @@
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId> <artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
plugins/storage/volume/solidfire/pom.xml
View File

@ -28,12 +28,10 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId> <artifactId>aspectjtools</artifactId>
<version>1.6.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

110
pom.xml
View File

@ -296,6 +296,96 @@
<artifactId>javax.persistence</artifactId> <artifactId>javax.persistence</artifactId>
<version>${cs.jpa.version}</version> <version>${cs.jpa.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${cs.servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${cs.httpcore.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${cs.httpcore.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>${cs.xstream.version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${cs.mail.version}</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>${cs.jstl.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${cs.guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
<version>2.1.0_1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
</dependency>
<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>${cs.daemon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${cs.axis.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.4</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -306,21 +396,6 @@
<version>${cs.junit.version}</version> <version>${cs.junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
@ -333,6 +408,11 @@
<version>${org.springframework.version}</version> <version>${org.springframework.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

7
server/pom.xml
View File

@ -25,7 +25,6 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${org.springframework.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -40,13 +39,11 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>${cs.servlet.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
<version>${cs.httpcore.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -56,22 +53,18 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${cs.httpcore.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>${cs.xstream.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<version>${cs.mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>${cs.jstl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>

5
services/console-proxy/server/pom.xml
View File

@ -33,17 +33,14 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency> </dependency>
<!-- required deps for the systemvm --> <!-- required deps for the systemvm -->
<dependency> <dependency>
@ -64,8 +61,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<resources> <resources>
<resource> <resource>
<directory>certs</directory> <directory>certs</directory>

6
services/secondary-storage/pom.xml
View File

@ -30,17 +30,14 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency> </dependency>
<!-- required deps for the systemvm --> <!-- required deps for the systemvm -->
<dependency> <dependency>
@ -61,9 +58,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

65
usage/pom.xml
View File

@ -1,22 +1,14 @@
<!-- <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
Licensed to the Apache Software Foundation (ASF) under one license agreements. See the NOTICE file distributed with this work for additional
or more contributor license agreements. See the NOTICE file information regarding copyright ownership. The ASF licenses this file to you under
distributed with this work for additional information the Apache License, Version 2.0 (the "License"); you may not use this file except
regarding copyright ownership. The ASF licenses this file in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
to you under the Apache License, Version 2.0 (the Unless required by applicable law or agreed to in writing, software distributed under
"License"); you may not use this file except in compliance the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
with the License. You may obtain a copy of the License at OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License. -->
http://www.apache.org/licenses/LICENSE-2.0 <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">
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> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-usage</artifactId> <artifactId>cloud-usage</artifactId>
<name>Apache CloudStack Usage Server</name> <name>Apache CloudStack Usage Server</name>
@ -49,15 +41,14 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-daemon</groupId> <groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId> <artifactId>commons-daemon</artifactId>
<version>${cs.daemon.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>resources</directory> <directory>resources</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
@ -65,15 +56,14 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes>
<exclude>com/cloud/usage/UsageManagerTest.java</exclude> <exclude>com/cloud/usage/UsageManagerTest.java</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>
@ -90,7 +80,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>generate-resource</id> <id>generate-resource</id>
@ -100,33 +89,27 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<copy overwrite="true" <copy overwrite="true" todir="${basedir}/target/transformed">
todir="${basedir}/target/transformed">
<fileset dir="${basedir}/../client/tomcatconf"> <fileset dir="${basedir}/../client/tomcatconf">
<include name="**/db.properties.in" /> <include name="**/db.properties.in" />
</fileset> </fileset>
<globmapper from="*.in" to="*" /> <globmapper from="*.in" to="*" />
<filterchain> <filterchain>
<filterreader <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
classname="org.apache.tools.ant.filters.ReplaceTokens"> <param type="propertiesfile" value="${cs.replace.properties}" />
<param type="propertiesfile"
value="${cs.replace.properties}" />
</filterreader> </filterreader>
</filterchain> </filterchain>
</copy> </copy>
</target> </target>
<target> <target>
<copy overwrite="true" <copy overwrite="true" todir="${basedir}/target/transformed">
todir="${basedir}/target/transformed">
<fileset dir="${basedir}/conf"> <fileset dir="${basedir}/conf">
<include name="*.in" /> <include name="*.in" />
</fileset> </fileset>
<globmapper from="*.in" to="*" /> <globmapper from="*.in" to="*" />
<filterchain> <filterchain>
<filterreader <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
classname="org.apache.tools.ant.filters.ReplaceTokens"> <param type="propertiesfile" value="${cs.replace.properties}" />
<param type="propertiesfile"
value="${cs.replace.properties}" />
</filterreader> </filterreader>
</filterchain> </filterchain>
</copy> </copy>
@ -185,7 +168,7 @@
<artifactId>cloud-usage</artifactId> <artifactId>cloud-usage</artifactId>
</executableDependency> </executableDependency>
<mainClass>com.cloud.usage.UsageServer</mainClass> <mainClass>com.cloud.usage.UsageServer</mainClass>
<arguments/> <arguments />
<systemProperties> <systemProperties>
<systemProperty> <systemProperty>
<key>catalina.home</key> <key>catalina.home</key>

4
vmware-base/pom.xml
View File

@ -45,7 +45,6 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${cs.gson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.cloud.com.vmware</groupId> <groupId>com.cloud.com.vmware</groupId>
@ -56,17 +55,14 @@
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId> <artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId> <artifactId>axis-jaxrpc</artifactId>
<version>${cs.axis.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>wsdl4j</groupId> <groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId> <artifactId>wsdl4j</artifactId>
<version>1.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>