Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 50068 invoked from network); 16 Dec 2009 19:34:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Dec 2009 19:34:17 -0000 Received: (qmail 96884 invoked by uid 500); 16 Dec 2009 19:34:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 96773 invoked by uid 500); 16 Dec 2009 19:34:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 96764 invoked by uid 99); 16 Dec 2009 19:34:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 19:34:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 19:34:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1A6832388A24; Wed, 16 Dec 2009 19:33:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091216193343.1A6832388A24@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ cxf-rt-transports-http-jetty ${pom.version} + + org.slf4j + slf4j-jdk14 + ${pom.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 @@ cxf-rt-transports-http-jetty ${pom.version} + + org.slf4j + slf4j-jdk14 + ${pom.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 @@ cxf-rt-transports-http-jetty ${project.version} + + org.slf4j + slf4j-jdk14 + test + org.apache.cxf 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 @@ test + org.slf4j + slf4j-jdk14 + test + + org.easymock easymockclassextension test 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 @@ test + org.slf4j + slf4j-jdk14 + test + + junit junit test 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 @@ test + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-frontend-jaxws ${project.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 @@ org.apache.cxf - cxf-rt-transports-http-jetty - ${project.version} - test - - - org.apache.cxf cxf-rt-frontend-jaxws ${project.version} test 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 @@ cxf-rt-bindings-xml ${pom.version} - - org.apache.cxf - cxf-rt-databinding-jaxb - + + org.apache.cxf + cxf-rt-databinding-jaxb + @@ -100,7 +100,7 @@ org.apache.abdera abdera-parser - ${abdera.version} + ${abdera.version} org.apache.abdera @@ -128,7 +128,7 @@ stax-api - + org.apache.geronimo.specs geronimo-servlet_2.5_spec @@ -149,18 +149,23 @@ cxf-rt-transports-local ${project.version} test - + org.apache.cxf cxf-rt-transports-http-jetty ${project.version} test - + + + org.slf4j + slf4j-jdk14 + test + org.apache.cxf cxf-rt-bindings-soap ${project.version} - test + test org.apache.cxf @@ -168,15 +173,7 @@ ${project.version} test - - org.apache.xmlbeans xmlbeans 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 @@ cxf-rt-transports-http ${project.version} - + org.apache.cxf cxf-rt-bindings-soap 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 @@ - junit - junit - test - - - org.easymock - easymockclassextension - test - - org.apache.cxf cxf-api ${project.version} @@ -58,50 +48,52 @@ cxf-rt-core ${project.version} - - - org.springframework spring-web - org.apache.cxf - cxf-testutils - ${project.version} - test - - - org.apache.cxf - cxf-common-schemas - ${project.version} - test - - org.mortbay.jetty jetty ${jetty.version} org.slf4j - slf4j-jdk14 - runtime - - - org.slf4j slf4j-api runtime - org.apache.geronimo.specs geronimo-servlet_2.5_spec + + + junit + junit + test + + + org.easymock + easymockclassextension + test + + + org.slf4j + slf4j-jdk14 + test + + + org.apache.cxf + cxf-testutils + ${project.version} + test + + + org.apache.cxf + cxf-common-schemas + ${project.version} + test + 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 destinations = new HashMap(); - private Bus bus; private Set messageFilterProperties; private Set messageIncludeProperties; - private Set uriPrefixes = URI_PREFIXES; + private Set uriPrefixes = new HashSet(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 @@ org.apache.cxf - cxf-rt-transports-http-jetty - ${project.version} - test - - - - org.apache.cxf cxf-testutils ${project.version} test 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 @@ ${project.version} test - org.apache.cxf - cxf-rt-transports-http-jetty + cxf-rt-transports-local ${project.version} test + org.apache.cxf cxf-testutils 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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-transports-local ${project.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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-transports-local ${project.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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-transports-local ${project.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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-transports-local ${project.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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-transports-local ${project.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 @@ ${project.version} + org.slf4j + slf4j-jdk14 + test + + org.apache.cxf cxf-rt-ws-addr ${project.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 @@ ${project.version} test + + org.slf4j + slf4j-jdk14 + test + org.mortbay.jetty