You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/09/05 17:19:47 UTC
git commit: Use anttasks to build the aar and mar files and add them
to the webapp
Updated Branches:
refs/heads/maven-waf c5a4f5c52 -> 2fc0763ac
Use anttasks to build the aar and mar files and add them to the webapp
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2fc0763a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2fc0763a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2fc0763a
Branch: refs/heads/maven-waf
Commit: 2fc0763acaf5803082c22c767f60a13c7e3febf0
Parents: c5a4f5c
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Sep 5 17:18:34 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Sep 5 17:18:34 2012 +0200
----------------------------------------------------------------------
awsapi/pom.xml | 98 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fc0763a/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 2909376..c6f440d 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -108,32 +108,78 @@
</resource>
</resources>
<plugins>
-<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-my-lib</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-webapp</artifactId>
- <version>${cs.axis2.version}</version>
- <type>war</type>
- <overWrite>false</overWrite>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- </configuration>
- </execution>
- </executions>
-</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-axis2-war</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-webapp</artifactId>
+ <version>${cs.axis2.version}</version>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <jar jarfile="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/services/cloud-auth-s3.mar" basedir="${project.build.directory}/classes/" excludes="**/*">
+ <fileset dir="${project.build.directory}/classes/">
+ <include name="**/auth/s3/*.class" />
+ </fileset>
+ <metainf dir="src/com/cloud/bridge/auth/s3">
+ <include name="module.xml" />
+ </metainf>
+ </jar>
+ <jar jarfile="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/services/cloud-s3.aar" basedir="${project.build.directory}/classes/" excludes="**/*">
+ <!--
+ <metainf dir="${base.dir}/resource/AmazonS3">
+ <include name="services.xml" />
+ <include name="AmazonS3.wsdl" />
+ </metainf>
+ -->
+ </jar>
+ <jar jarfile="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/services/cloud-ec2.aar" basedir="${project.build.directory}/classes/" excludes="**/*">
+ <metainf dir="resource/AmazonEC2">
+ <include name="services.xml" />
+ <include name="AmazonEC2.wsdl" />
+ </metainf>
+ </jar>
+ <jar jarfile="${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/services/cloud-auth-ec2.mar" basedir="${project.build.directory}/classes/" excludes="**/*">
+ <fileset dir="${project.build.directory}/classes/">
+ <include name="**/auth/ec2/*.class" />
+ </fileset>
+ <metainf dir="src/com/cloud/bridge/auth/ec2">
+ <include name="module.xml" />
+ </metainf>
+ </jar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>