Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/516dd173 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/516dd173 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/516dd173 Branch: refs/heads/javelin Commit: 516dd173fe896c072f2d70e24b906d5a1c4819fa Parents: 5ca495d Author: Chip Childers <[email protected]> Authored: Mon Sep 10 14:39:43 2012 -0400 Committer: Alex Huang <[email protected]> Committed: Tue Sep 11 17:37:52 2012 -0700 ---------------------------------------------------------------------- .gitignore | 2 + LICENSE | 2 +- NOTICE | 2 +- awsapi/deploy-cloud-bridge.sh | 2 +- .../docs/AmazonEC2/EC2-local-deploy-using-ant.html | 2 +- awsapi/pom.xml | 147 +++++++++++++++ build/build-aws-api.xml | 2 +- tools/whisker/descriptor.xml | 2 +- 8 files changed, 155 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index e5bd155..0d4c0e3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ api.log.*.gz cloud.log.*.* unittest deps/cloud.userlibraries +deps/awsapi-lib/ .DS_Store .idea *.iml @@ -45,3 +46,4 @@ git-remote-https.exe.stackdump *.swp tools/devcloud/devcloudbox/.vagrant deps/*.jar +deps/*.mar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 210f282..1394d65 100644 --- a/LICENSE +++ b/LICENSE @@ -353,7 +353,7 @@ Within the deps/awsapi-lib directory axis2-kernel-1.5.1.jar http://axis.apache.org/axis/ axis2-transport-http-1.5.1.jar http://axis.apache.org/axis/ axis2-transport-local-1.5.1.jar http://axis.apache.org/axis/ - axis2.war http://axis.apache.org/axis/ + axis2-webapp-1.5.1.war http://axis.apache.org/axis/ commons-codec-1.4.jar http://commons.apache.org/codec/ commons-collections-3.1.jar http://commons.apache.org/collections/ commons-fileupload-1.2.jar http://commons.apache.org/fileupload/ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 34bcc3a..cecb580 100644 --- a/NOTICE +++ b/NOTICE @@ -456,7 +456,7 @@ axis2-kernel-1.5.1.jar axis2-transport-http-1.5.1.jar axis2-transport-local-1.5.1.jar - axis2.war + axis2-webapp-1.5.1.war cloud-axis.jar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/awsapi/deploy-cloud-bridge.sh ---------------------------------------------------------------------- diff --git a/awsapi/deploy-cloud-bridge.sh b/awsapi/deploy-cloud-bridge.sh index d36c022..d24e3cc 100644 --- a/awsapi/deploy-cloud-bridge.sh +++ b/awsapi/deploy-cloud-bridge.sh @@ -76,7 +76,7 @@ mkdir "$CATALINA_HOME/temp" mkdir "$CATALINA_HOME/webapps/bridge" -if ! unzip -o ./axis2.war -d $deploydir/webapps/bridge +if ! unzip -o ./axis2-webapp-1.5.1.war -d $deploydir/webapps/bridge then exit 10; fi http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html ---------------------------------------------------------------------- diff --git a/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html b/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html index 215e578..07ba3aa 100644 --- a/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html +++ b/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html @@ -67,7 +67,7 @@ ls dist/ cloud-auth-ec2.mar cloud-auth-s3.mar cloud-bridge.jar cloud-ec2.aar cloud-s3.aar -* deploy-axis - copies and unwars cloud-bridge/lib/axis2.war to $CATALINA_HOME/webapps/bridge directory +* deploy-axis - copies and unwars cloud-bridge/lib/axis2-webapp-1.5.1.war to $CATALINA_HOME/webapps/bridge directory <b>ant deploy-cloud-bridge</b> copies files to $CATALINA_HOME/webapps/bridge tomcat directory: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index f7fe913..89d942f 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -39,6 +39,12 @@ <version>${cs.axis2.version}</version> </dependency> <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-webapp</artifactId> + <type>war</type> + <version>${cs.axis2.version}</version> + </dependency> + <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> <version>${cs.axiom.version}</version> @@ -84,6 +90,96 @@ <artifactId>CAStorSDK</artifactId> <version>1.3.1-CS40</version> </dependency> + <dependency> + <groupId>com.apache.rampart</groupId> + <artifactId>rahas</artifactId> + <version>1.5</version> + <type>mar</type> + </dependency> + <dependency> + <groupId>com.apache.rampart</groupId> + <artifactId>rampart</artifactId> + <version>1.5</version> + <type>mar</type> + </dependency> + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-core</artifactId> + <version>1.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-policy</artifactId> + <version>1.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.rampart</groupId> + <artifactId>rampart-trust</artifactId> + <version>1.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.5.11</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.11</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.ws.security</groupId> + <artifactId>wss4j</artifactId> + <version>1.5.8</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>1.5.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>xmltooling</artifactId> + <version>1.3.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>openws</artifactId> + <version>1.4.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.5</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>2.2.3</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.santuario</groupId> + <artifactId>xmlsec</artifactId> + <version>1.4.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> + <version>1.45</version> + <scope>runtime</scope> + </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> @@ -96,6 +192,57 @@ </excludes> </resource> </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>../deps/awsapi-lib/rampart-lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <includeArtifactIds>rampart-core,rampart-policy,rampart-trust,slf4j-jdk14,slf4j-api,wss4j,joda-time,xmltooling,openws,velocity,opensaml,xmlsec,bcprov-jdk16</includeArtifactIds> + </configuration> + </execution> + <execution> + <id>copy-axis2-war</id> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>../deps/awsapi-lib/</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <includeArtifactIds>axis2-webapp</includeArtifactIds> + </configuration> + </execution> + <execution> + <id>copy-mars</id> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>../deps/awsapi-lib/modules</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <includeArtifactIds>rampart,rahas</includeArtifactIds> + </configuration> + </execution> + </executions> + </plugin> + </plugins> <!-- <testSourceDirectory>test</testSourceDirectory> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/build/build-aws-api.xml ---------------------------------------------------------------------- diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml index eae1914..72676af 100644 --- a/build/build-aws-api.xml +++ b/build/build-aws-api.xml @@ -171,7 +171,7 @@ </jar> </target> <target name="deploy-axis" depends="-init-awsapi"> - <unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" /> + <unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" /> </target> <condition property="access_key.private.notpresent"> <not> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/516dd173/tools/whisker/descriptor.xml ---------------------------------------------------------------------- diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index ad29c69..b927bfc 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2795,7 +2795,7 @@ Copyright © 2004-2012 The Apache Software Foundation <resource name="axis2-kernel-1.5.1.jar" source="http://axis.apache.org/axis/"; notice='axis2.notice' /> <resource name="axis2-transport-http-1.5.1.jar" source="http://axis.apache.org/axis/"; notice='axis2.notice' /> <resource name="axis2-transport-local-1.5.1.jar" source="http://axis.apache.org/axis/"; notice='axis2.notice' /> - <resource name="axis2.war" source="http://axis.apache.org/axis/"; notice='axis2.notice' /> + <resource name="axis2-webapp-1.5.1.war" source="http://axis.apache.org/axis/"; notice='axis2.notice' /> <resource name="commons-codec-1.4.jar" source="http://commons.apache.org/codec/"; notice="codec" /> <resource name="commons-collections-3.1.jar" source="http://commons.apache.org/collections/"/> <resource name='commons-fileupload-1.2.jar' source='http://commons.apache.org/fileupload/' />
