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

Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26

Browse Source
This commit is contained in:
Chip Childers 2012-09-10 14:39:43 -04:00 committed by Alex Huang
parent 5ca495d4c9
commit 516dd173fe
8 changed files with 155 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -38,6 +38,7 @@ api.log.*.gz
cloud.log.*.* cloud.log.*.*
unittest unittest
deps/cloud.userlibraries deps/cloud.userlibraries
deps/awsapi-lib/
.DS_Store .DS_Store
.idea .idea
*.iml *.iml
@ -45,3 +46,4 @@ git-remote-https.exe.stackdump
*.swp *.swp
tools/devcloud/devcloudbox/.vagrant tools/devcloud/devcloudbox/.vagrant
deps/*.jar deps/*.jar
deps/*.mar

2
LICENSE
View File

@ -353,7 +353,7 @@ Within the deps/awsapi-lib directory
axis2-kernel-1.5.1.jar http://axis.apache.org/axis/ 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-http-1.5.1.jar http://axis.apache.org/axis/
axis2-transport-local-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-codec-1.4.jar http://commons.apache.org/codec/
commons-collections-3.1.jar http://commons.apache.org/collections/ commons-collections-3.1.jar http://commons.apache.org/collections/
commons-fileupload-1.2.jar http://commons.apache.org/fileupload/ commons-fileupload-1.2.jar http://commons.apache.org/fileupload/

2
NOTICE
View File

@ -456,7 +456,7 @@
axis2-kernel-1.5.1.jar axis2-kernel-1.5.1.jar
axis2-transport-http-1.5.1.jar axis2-transport-http-1.5.1.jar
axis2-transport-local-1.5.1.jar axis2-transport-local-1.5.1.jar
axis2.war axis2-webapp-1.5.1.war
cloud-axis.jar cloud-axis.jar

2
awsapi/deploy-cloud-bridge.sh
View File

@ -76,7 +76,7 @@ mkdir "$CATALINA_HOME/temp"
mkdir "$CATALINA_HOME/webapps/bridge" 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 then
exit 10; exit 10;
fi fi

2
awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html
View File

@ -67,7 +67,7 @@ ls dist/
cloud-auth-ec2.mar cloud-auth-s3.mar cloud-bridge.jar cloud-ec2.aar cloud-s3.aar 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: <b>ant deploy-cloud-bridge</b> copies files to $CATALINA_HOME/webapps/bridge tomcat directory:

147
awsapi/pom.xml
View File

@ -38,6 +38,12 @@
<artifactId>axis2</artifactId> <artifactId>axis2</artifactId>
<version>${cs.axis2.version}</version> <version>${cs.axis2.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-webapp</artifactId>
<type>war</type>
<version>${cs.axis2.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId> <artifactId>axiom-api</artifactId>
@ -84,6 +90,96 @@
<artifactId>CAStorSDK</artifactId> <artifactId>CAStorSDK</artifactId>
<version>1.3.1-CS40</version> <version>1.3.1-CS40</version>
</dependency> </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> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
@ -96,6 +192,57 @@
</excludes> </excludes>
</resource> </resource>
</resources> </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> <testSourceDirectory>test</testSourceDirectory>
<plugins> <plugins>

2
build/build-aws-api.xml
View File

@ -171,7 +171,7 @@
</jar> </jar>
</target> </target>
<target name="deploy-axis" depends="-init-awsapi"> <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> </target>
<condition property="access_key.private.notpresent"> <condition property="access_key.private.notpresent">
<not> <not>

2
tools/whisker/descriptor.xml
View File

@ -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-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-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-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-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-collections-3.1.jar" source="http://commons.apache.org/collections/"/>
<resource name='commons-fileupload-1.2.jar' source='http://commons.apache.org/fileupload/' /> <resource name='commons-fileupload-1.2.jar' source='http://commons.apache.org/fileupload/' />