Skip to content

Commit b1ae7c7

Browse files
chipchilderschipchilders
committed
Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26
1 parent e6f82b1 commit b1ae7c7

8 files changed

Lines changed: 155 additions & 6 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ api.log.*.gz
3838
cloud.log.*.*
3939
unittest
4040
deps/cloud.userlibraries
41+
deps/awsapi-lib/
4142
.DS_Store
4243
.idea
4344
*.iml
4445
git-remote-https.exe.stackdump
4546
*.swp
4647
tools/devcloud/devcloudbox/.vagrant
4748
deps/*.jar
49+
deps/*.mar

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ Within the deps/awsapi-lib directory
353353
axis2-kernel-1.5.1.jar http://axis.apache.org/axis/
354354
axis2-transport-http-1.5.1.jar http://axis.apache.org/axis/
355355
axis2-transport-local-1.5.1.jar http://axis.apache.org/axis/
356-
axis2.war http://axis.apache.org/axis/
356+
axis2-webapp-1.5.1.war http://axis.apache.org/axis/
357357
commons-codec-1.4.jar http://commons.apache.org/codec/
358358
commons-collections-3.1.jar http://commons.apache.org/collections/
359359
commons-fileupload-1.2.jar http://commons.apache.org/fileupload/

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
axis2-kernel-1.5.1.jar
457457
axis2-transport-http-1.5.1.jar
458458
axis2-transport-local-1.5.1.jar
459-
axis2.war
459+
axis2-webapp-1.5.1.war
460460
cloud-axis.jar
461461

462462

‎awsapi/deploy-cloud-bridge.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mkdir "$CATALINA_HOME/temp"
7676
mkdir "$CATALINA_HOME/webapps/bridge"
7777

7878

79-
if ! unzip -o ./axis2.war -d $deploydir/webapps/bridge
79+
if ! unzip -o ./axis2-webapp-1.5.1.war -d $deploydir/webapps/bridge
8080
then
8181
exit 10;
8282
fi

‎awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <H2 id="build">3. Build, deploy and run cloud-bridge with ant</H2>
6767
cloud-auth-ec2.mar cloud-auth-s3.mar cloud-bridge.jar cloud-ec2.aar cloud-s3.aar
6868

6969

70-
* deploy-axis - copies and unwars cloud-bridge/lib/axis2.war to $CATALINA_HOME/webapps/bridge directory
70+
* deploy-axis - copies and unwars cloud-bridge/lib/axis2-webapp-1.5.1.war to $CATALINA_HOME/webapps/bridge directory
7171

7272
<b>ant deploy-cloud-bridge</b> copies files to $CATALINA_HOME/webapps/bridge tomcat directory:
7373

‎awsapi/pom.xml‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<artifactId>axis2</artifactId>
3939
<version>${cs.axis2.version}</version>
4040
</dependency>
41+
<dependency>
42+
<groupId>org.apache.axis2</groupId>
43+
<artifactId>axis2-webapp</artifactId>
44+
<type>war</type>
45+
<version>${cs.axis2.version}</version>
46+
</dependency>
4147
<dependency>
4248
<groupId>org.apache.ws.commons.axiom</groupId>
4349
<artifactId>axiom-api</artifactId>
@@ -84,6 +90,96 @@
8490
<artifactId>CAStorSDK</artifactId>
8591
<version>1.3.1-CS40</version>
8692
</dependency>
93+
<dependency>
94+
<groupId>com.apache.rampart</groupId>
95+
<artifactId>rahas</artifactId>
96+
<version>1.5</version>
97+
<type>mar</type>
98+
</dependency>
99+
<dependency>
100+
<groupId>com.apache.rampart</groupId>
101+
<artifactId>rampart</artifactId>
102+
<version>1.5</version>
103+
<type>mar</type>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.apache.rampart</groupId>
107+
<artifactId>rampart-core</artifactId>
108+
<version>1.5</version>
109+
<scope>runtime</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.apache.rampart</groupId>
113+
<artifactId>rampart-policy</artifactId>
114+
<version>1.5</version>
115+
<scope>runtime</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.apache.rampart</groupId>
119+
<artifactId>rampart-trust</artifactId>
120+
<version>1.5</version>
121+
<scope>runtime</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.slf4j</groupId>
125+
<artifactId>slf4j-jdk14</artifactId>
126+
<version>1.5.11</version>
127+
<scope>runtime</scope>
128+
</dependency>
129+
<dependency>
130+
<groupId>org.slf4j</groupId>
131+
<artifactId>slf4j-api</artifactId>
132+
<version>1.5.11</version>
133+
<scope>runtime</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.apache.ws.security</groupId>
137+
<artifactId>wss4j</artifactId>
138+
<version>1.5.8</version>
139+
<scope>runtime</scope>
140+
</dependency>
141+
<dependency>
142+
<groupId>joda-time</groupId>
143+
<artifactId>joda-time</artifactId>
144+
<version>1.5.2</version>
145+
<scope>runtime</scope>
146+
</dependency>
147+
<dependency>
148+
<groupId>org.opensaml</groupId>
149+
<artifactId>xmltooling</artifactId>
150+
<version>1.3.1</version>
151+
<scope>runtime</scope>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.opensaml</groupId>
155+
<artifactId>openws</artifactId>
156+
<version>1.4.1</version>
157+
<scope>runtime</scope>
158+
</dependency>
159+
<dependency>
160+
<groupId>velocity</groupId>
161+
<artifactId>velocity</artifactId>
162+
<version>1.5</version>
163+
<scope>runtime</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>org.opensaml</groupId>
167+
<artifactId>opensaml</artifactId>
168+
<version>2.2.3</version>
169+
<scope>runtime</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.apache.santuario</groupId>
173+
<artifactId>xmlsec</artifactId>
174+
<version>1.4.2</version>
175+
<scope>runtime</scope>
176+
</dependency>
177+
<dependency>
178+
<groupId>org.bouncycastle</groupId>
179+
<artifactId>bcprov-jdk16</artifactId>
180+
<version>1.45</version>
181+
<scope>runtime</scope>
182+
</dependency>
87183
</dependencies>
88184
<build>
89185
<defaultGoal>install</defaultGoal>
@@ -96,6 +192,57 @@
96192
</excludes>
97193
</resource>
98194
</resources>
195+
<plugins>
196+
<plugin>
197+
<groupId>org.apache.maven.plugins</groupId>
198+
<artifactId>maven-dependency-plugin</artifactId>
199+
<version>2.5.1</version>
200+
<executions>
201+
<execution>
202+
<id>copy-dependencies</id>
203+
<phase>install</phase>
204+
<goals>
205+
<goal>copy-dependencies</goal>
206+
</goals>
207+
<configuration>
208+
<outputDirectory>../deps/awsapi-lib/rampart-lib</outputDirectory>
209+
<overWriteReleases>false</overWriteReleases>
210+
<overWriteSnapshots>false</overWriteSnapshots>
211+
<overWriteIfNewer>true</overWriteIfNewer>
212+
<includeArtifactIds>rampart-core,rampart-policy,rampart-trust,slf4j-jdk14,slf4j-api,wss4j,joda-time,xmltooling,openws,velocity,opensaml,xmlsec,bcprov-jdk16</includeArtifactIds>
213+
</configuration>
214+
</execution>
215+
<execution>
216+
<id>copy-axis2-war</id>
217+
<phase>install</phase>
218+
<goals>
219+
<goal>copy-dependencies</goal>
220+
</goals>
221+
<configuration>
222+
<outputDirectory>../deps/awsapi-lib/</outputDirectory>
223+
<overWriteReleases>false</overWriteReleases>
224+
<overWriteSnapshots>false</overWriteSnapshots>
225+
<overWriteIfNewer>true</overWriteIfNewer>
226+
<includeArtifactIds>axis2-webapp</includeArtifactIds>
227+
</configuration>
228+
</execution>
229+
<execution>
230+
<id>copy-mars</id>
231+
<phase>install</phase>
232+
<goals>
233+
<goal>copy-dependencies</goal>
234+
</goals>
235+
<configuration>
236+
<outputDirectory>../deps/awsapi-lib/modules</outputDirectory>
237+
<overWriteReleases>false</overWriteReleases>
238+
<overWriteSnapshots>false</overWriteSnapshots>
239+
<overWriteIfNewer>true</overWriteIfNewer>
240+
<includeArtifactIds>rampart,rahas</includeArtifactIds>
241+
</configuration>
242+
</execution>
243+
</executions>
244+
</plugin>
245+
</plugins>
99246
<!--
100247
<testSourceDirectory>test</testSourceDirectory>
101248
<plugins>

‎build/build-aws-api.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
</jar>
172172
</target>
173173
<target name="deploy-axis" depends="-init-awsapi">
174-
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
174+
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
175175
</target>
176176
<condition property="access_key.private.notpresent">
177177
<not>

‎tools/whisker/descriptor.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2795,7 +2795,7 @@ Copyright © 2004-2012 The Apache Software Foundation
27952795
<resource name="axis2-kernel-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
27962796
<resource name="axis2-transport-http-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
27972797
<resource name="axis2-transport-local-1.5.1.jar" source="http://axis.apache.org/axis/" notice='axis2.notice' />
2798-
<resource name="axis2.war" source="http://axis.apache.org/axis/" notice='axis2.notice' />
2798+
<resource name="axis2-webapp-1.5.1.war" source="http://axis.apache.org/axis/" notice='axis2.notice' />
27992799
<resource name="commons-codec-1.4.jar" source="http://commons.apache.org/codec/" notice="codec" />
28002800
<resource name="commons-collections-3.1.jar" source="http://commons.apache.org/collections/"/>
28012801
<resource name='commons-fileupload-1.2.jar' source='http://commons.apache.org/fileupload/' />

0 commit comments

Comments
 (0)