diff --git a/.gitignore b/.gitignore
index e5bd1558290..0d4c0e3ea93 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
diff --git a/LICENSE b/LICENSE
index 210f282912a..1394d656fa0 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/             
diff --git a/NOTICE b/NOTICE
index 34bcc3ac367..cecb580925e 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
   
 
diff --git a/awsapi/deploy-cloud-bridge.sh b/awsapi/deploy-cloud-bridge.sh
index d36c0225b87..d24e3ccdbf1 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
diff --git a/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html b/awsapi/docs/AmazonEC2/EC2-local-deploy-using-ant.html
index 215e5785c36..07ba3aa4222 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:
 
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index f7fe91310a9..89d942f1bd9 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -38,6 +38,12 @@
       <artifactId>axis2</artifactId>
       <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>
@@ -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>
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index eae19146da9..72676afd506 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>
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index ad29c693ba3..b927bfc9528 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/' />