cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r891396 - in /cxf/branches/2.2.x-fixes: ./ distribution/ distribution/manifest/ integration/jca/ rt/bindings/http/ rt/bindings/object/ rt/databinding/aegis/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/ rt/frontend/simple/src/test/java/org/ap...
Date Wed, 16 Dec 2009 19:33:40 GMT
Author: dkulp
Date: Wed Dec 16 19:33:37 2009
New Revision: 891396

URL: http://svn.apache.org/viewvc?rev=891396&view=rev
Log:
Merged revisions 891375,891393 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r891375 | dkulp | 2009-12-16 13:46:56 -0500 (Wed, 16 Dec 2009) | 1 line
  
  [CXF-2583] Make slf4j-jdk14 a test scope dep
........
  r891393 | dkulp | 2009-12-16 14:29:44 -0500 (Wed, 16 Dec 2009) | 1 line
  
  Re-add jetty as runtime scope.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml
    cxf/branches/2.2.x-fixes/distribution/pom.xml
    cxf/branches/2.2.x-fixes/integration/jca/pom.xml
    cxf/branches/2.2.x-fixes/rt/bindings/http/pom.xml
    cxf/branches/2.2.x-fixes/rt/bindings/object/pom.xml
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml
    cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/pom.xml
    cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
    cxf/branches/2.2.x-fixes/rt/testsupport/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/http-jetty/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
    cxf/branches/2.2.x-fixes/rt/ws/addr/pom.xml
    cxf/branches/2.2.x-fixes/rt/ws/policy/pom.xml
    cxf/branches/2.2.x-fixes/systests/databinding/pom.xml
    cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml
    cxf/branches/2.2.x-fixes/systests/transports/pom.xml
    cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml
    cxf/branches/2.2.x-fixes/tools/wsdlto/test/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:891375-891393

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/manifest/pom.xml Wed Dec 16 19:33:37 2009
@@ -152,6 +152,10 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: cxf/branches/2.2.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/pom.xml Wed Dec 16 19:33:37 2009
@@ -162,6 +162,10 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>

Modified: cxf/branches/2.2.x-fixes/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/integration/jca/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/integration/jca/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/integration/jca/pom.xml Wed Dec 16 19:33:37 2009
@@ -96,6 +96,11 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/2.2.x-fixes/rt/bindings/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/http/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/http/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/http/pom.xml Wed Dec 16 19:33:37 2009
@@ -82,6 +82,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.2.x-fixes/rt/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/object/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/object/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/object/pom.xml Wed Dec 16 19:33:37 2009
@@ -62,6 +62,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/pom.xml Wed Dec 16 19:33:37 2009
@@ -67,6 +67,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/pom.xml Wed Dec 16 19:33:37 2009
@@ -110,12 +110,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/pom.xml Wed Dec 16 19:33:37 2009
@@ -67,10 +67,10 @@
             <artifactId>cxf-rt-bindings-xml</artifactId>
             <version>${pom.version}</version>
             <exclusions>
-               <exclusion>
-                  <groupId>org.apache.cxf</groupId>
-                  <artifactId>cxf-rt-databinding-jaxb</artifactId>
-               </exclusion>
+                <exclusion>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-databinding-jaxb</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-parser</artifactId>
-            <version>${abdera.version}</version>  
+            <version>${abdera.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
@@ -128,7 +128,7 @@
                     <artifactId>stax-api</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -149,18 +149,23 @@
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency> 
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope> 
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -168,15 +173,7 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-<!--
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-databinding-sdo</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency> 
--->
-	<dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
         </dependency>

Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
Wed Dec 16 19:33:37 2009
@@ -48,6 +48,7 @@
         dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/", soapTF);
 
         LocalTransportFactory localTransport = new LocalTransportFactory();
+        localTransport.getUriPrefixes().add("http");
         dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/http", localTransport);
         dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/http", localTransport);
 

Modified: cxf/branches/2.2.x-fixes/rt/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/testsupport/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/testsupport/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/testsupport/pom.xml Wed Dec 16 19:33:37 2009
@@ -30,11 +30,11 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>

Modified: cxf/branches/2.2.x-fixes/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-jetty/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-jetty/pom.xml Wed Dec 16 19:33:37 2009
@@ -34,16 +34,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
@@ -58,50 +48,52 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!--dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <classifier>tests</classifier>
-            <version>${project.version}</version>
-        </dependency-->
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-common-schemas</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>${jetty.version}</version>
         </dependency>       
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-common-schemas</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: cxf/branches/2.2.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
Wed Dec 16 19:33:37 2009
@@ -60,11 +60,10 @@
     }
     
     private Map<String, Destination> destinations = new HashMap<String, Destination>();
-    private Bus bus;
 
     private Set<String> messageFilterProperties;
     private Set<String> messageIncludeProperties;
-    private Set<String> uriPrefixes = URI_PREFIXES;
+    private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
     
     public LocalTransportFactory() {
         super();
@@ -85,13 +84,9 @@
     
     @Resource(name = "cxf")
     public void setBus(Bus b) {
-        bus = b;
+        super.setBus(b);
     }
 
-    public Bus getBus() {
-        return bus;
-    }
-    
     public Destination getDestination(EndpointInfo ei) throws IOException {
         return getDestination(ei, createReference(ei));
     }

Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/pom.xml Wed Dec 16 19:33:37 2009
@@ -72,13 +72,6 @@
 		<!-- Test stuff -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: cxf/branches/2.2.x-fixes/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/policy/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/policy/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/policy/pom.xml Wed Dec 16 19:33:37 2009
@@ -62,13 +62,13 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>

Modified: cxf/branches/2.2.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/databinding/pom.xml Wed Dec 16 19:33:37 2009
@@ -201,6 +201,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/jaxrs/pom.xml Wed Dec 16 19:33:37 2009
@@ -144,6 +144,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/jaxws/pom.xml Wed Dec 16 19:33:37 2009
@@ -149,6 +149,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/pom.xml Wed Dec 16 19:33:37 2009
@@ -130,6 +130,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Wed Dec 16 19:33:37 2009
@@ -207,6 +207,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/pom.xml Wed Dec 16 19:33:37 2009
@@ -197,6 +197,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/test/pom.xml?rev=891396&r1=891395&r2=891396&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/test/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/test/pom.xml Wed Dec 16 19:33:37 2009
@@ -68,6 +68,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-jdk14</artifactId>
+              <scope>test</scope>
+          </dependency>
 
         <dependency>
             <groupId>org.mortbay.jetty</groupId>



Mime
View raw message