Fix some dependencies for awsapi. Axis2 and rampart versions should be

spark404 · spark404 · commit 28bfaea0d1ee · 2012-10-01T21:36:27.000-07:00
equal otherwise there will be conflicts with dependencies.

Small change to EC2MainServlet, pass along the rootcause for easier
debugging
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
@@ -19,8 +19,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cloud-awsapi</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
   <name>Apache CloudStack AWS API Bridge</name>
+  <packaging>war</packaging>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.ws.commons.axiom</groupId>
-      <artifactId>axiom-api</artifactId>
+      <artifactId>axiom-impl</artifactId>
       <version>${cs.axiom.version}</version>
     </dependency>
     <dependency>
@@ -57,6 +57,16 @@
       <groupId>org.apache.neethi</groupId>
       <artifactId>neethi</artifactId>
       <version>${cs.neethi.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-impl</artifactId>
+        </exclusion>
+      </exclusions>      
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -160,19 +170,19 @@
     <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jdk14</artifactId>
-        <version>1.5.11</version>
+        <version>1.6.1</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.5.11</version>
+        <version>1.6.1</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
         <groupId>org.apache.ws.security</groupId>
         <artifactId>wss4j</artifactId>
-        <version>1.5.8</version>
+        <version>1.6.1</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -217,6 +227,12 @@
         <version>1.45</version>
         <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.21</version>
+      <scope>runtime</scope>
+    </dependency>    
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -279,6 +295,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.26</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>7080</port>
+              <maxIdleTime>60000</maxIdleTime>
+            </connector>
+          </connectors>
+          <contextPath>/awsapi</contextPath>
+          <webXml>${basedir}/web/web.xml</webXml>
+          <webAppSourceDirectory>${basedir}/target/cloud-awsapi-${project.version}</webAppSourceDirectory>
+        </configuration>
+      </plugin>      
     </plugins>
     <!--
         <testSourceDirectory>test</testSourceDirectory>
@@ -343,5 +375,4 @@
       </plugins>
     </pluginManagement>
   </build>
-  <packaging>war</packaging>
 </project>
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -65,7 +65,7 @@ public void init( ServletConfig config ) throws ServletException {
     		}
     		logger.info("Value of EC2 API Flag ::" + value);
 		}catch(Exception e){
-		    throw new ServletException("Error initializing awsapi: " + e.getMessage());
+		    throw new ServletException("Error initializing awsapi: " + e.getMessage(), e);
 		}
 	}
 	
diff --git a/pom.xml b/pom.xml
@@ -72,9 +72,9 @@
     <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
     <cs.mail.version>1.4</cs.mail.version>
     <cs.axis.version>1.4</cs.axis.version>
-    <cs.axis2.version>1.5.1</cs.axis2.version>
+    <cs.axis2.version>1.6.2</cs.axis2.version>
     <cs.rampart.version>1.6.2</cs.rampart.version>
-    <cs.axiom.version>1.2.8</cs.axiom.version>
+    <cs.axiom.version>1.2.13</cs.axiom.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void init( ServletConfig config ) throws ServletException {`
`65`	`65`	`}`
`66`	`66`	`logger.info("Value of EC2 API Flag ::" + value);`
`67`	`67`	`}catch(Exception e){`
`68`		`- throw new ServletException("Error initializing awsapi: " + e.getMessage());`
	`68`	`+ throw new ServletException("Error initializing awsapi: " + e.getMessage(), e);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`