[jbossws-commits] JBossWS SVN: r16467 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP10: modules/server and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-07-12 13:25:50 -0400 (Thu, 12 Jul 2012)
New Revision: 16467

Modified:
   stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/pom.xml
   stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
   stack/cxf/tags/jbossws-cxf-3.1.2.SP10/pom.xml
Log:
svn merge -r 16464:16466 https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-3.1.2 .


Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/pom.xml	2012-07-12 17:13:10 UTC (rev 16466)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/pom.xml	2012-07-12 17:25:50 UTC (rev 16467)
@@ -158,6 +158,10 @@
       <artifactId>jaxws-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.javaee</groupId>
       <artifactId>jboss-ejb-api</artifactId>
     </dependency>

Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java	2012-07-12 17:13:10 UTC (rev 16466)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP10/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java	2012-07-12 17:25:50 UTC (rev 16467)
@@ -80,7 +80,7 @@
          writeTo(writer);
          writer.close();
 
-         return tmpFile.toURL();
+         return tmpFile.toURI().toURL();
       }
       catch (IOException ex)
       {

Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP10/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP10/pom.xml	2012-07-12 17:13:10 UTC (rev 16466)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP10/pom.xml	2012-07-12 17:25:50 UTC (rev 16467)
@@ -74,6 +74,7 @@
     <commons.logging.version>1.1.1</commons.logging.version>
     <log4j.version>1.2.14</log4j.version>
     <saaj.api.version>1.3</saaj.api.version>
+    <servlet.api.version>2.5</servlet.api.version>
     <velocity.version>1.5</velocity.version>
     <xmlsec.version>1.5.1</xmlsec.version>
     <wss4j.version>1.5.12-patch-01</wss4j.version>
@@ -480,6 +481,12 @@
       
       <!-- jboss provided -->
       <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${servlet.api.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
         <version>${jboss.common.core.version}</version>