Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 59114 invoked from network); 4 Apr 2007 20:24:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2007 20:24:47 -0000 Received: (qmail 3091 invoked by uid 500); 4 Apr 2007 20:24:54 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 3042 invoked by uid 500); 4 Apr 2007 20:24:53 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 3033 invoked by uid 99); 4 Apr 2007 20:24:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 13:24:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 13:24:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F03E21A9838; Wed, 4 Apr 2007 13:24:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r525597 - in /incubator/cxf/trunk: ./ distribution/ integration/jca/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ rt/ rt/bindings/http/ rt/databinding/aegis/ rt/transports/http-jetty/ rt/transports/http-jetty/src/ rt/transports/htt... Date: Wed, 04 Apr 2007 20:24:22 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070404202423.F03E21A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Apr 4 13:24:19 2007 New Revision: 525597 URL: http://svn.apache.org/viewvc?view=rev&rev=525597 Log: Split direct jetty dependencies into separate http-jetty module Added: incubator/cxf/trunk/rt/transports/http-jetty/ (with props) incubator/cxf/trunk/rt/transports/http-jetty/pom.xml - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/pom.xml incubator/cxf/trunk/rt/transports/http-jetty/src/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyContextInspector.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPHandler.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java (with props) incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties (with props) incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ServerEngine.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/JettySslConnectorFactory.java incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties (with props) incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/bus-extensions.xml incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml incubator/cxf/trunk/rt/transports/http-jetty/src/test/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyContextInspectorTest.java incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPServerEngineTest.java incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/cxfcfg.xml - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ - copied from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java - copied, changed from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java Removed: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyContextInspector.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPHandler.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ServerEngine.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/JettySslConnectorFactory.java incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/bus-extensions.xml incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyContextInspectorTest.java incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPServerEngineTest.java incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java Modified: incubator/cxf/trunk/distribution/pom.xml incubator/cxf/trunk/integration/jca/pom.xml incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java incubator/cxf/trunk/pom.xml incubator/cxf/trunk/rt/bindings/http/pom.xml incubator/cxf/trunk/rt/databinding/aegis/pom.xml incubator/cxf/trunk/rt/pom.xml incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml incubator/cxf/trunk/rt/ws/security/pom.xml incubator/cxf/trunk/systests/pom.xml incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Modified: incubator/cxf/trunk/distribution/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/distribution/pom.xml (original) +++ incubator/cxf/trunk/distribution/pom.xml Wed Apr 4 13:24:19 2007 @@ -118,6 +118,11 @@ cxf-rt-transports-http ${pom.version} + + ${pom.groupId} + cxf-rt-transports-http-jetty + ${pom.version} + ${pom.groupId} Modified: incubator/cxf/trunk/integration/jca/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/integration/jca/pom.xml (original) +++ incubator/cxf/trunk/integration/jca/pom.xml Wed Apr 4 13:24:19 2007 @@ -91,6 +91,11 @@ cxf-rt-transports-http ${project.version} + + org.apache.cxf + cxf-rt-transports-http-jetty + ${project.version} + org.apache.cxf Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java (original) +++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java Wed Apr 4 13:24:19 2007 @@ -64,7 +64,8 @@ import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.transport.ConduitInitiatorManager; import org.apache.cxf.transport.DestinationFactoryManager; -import org.apache.cxf.transport.http.HTTPTransportFactory; +import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; +import org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory; import org.apache.cxf.wsdl.WSDLManager; import org.apache.cxf.wsdl11.WSDLManagerImpl; @@ -122,7 +123,7 @@ dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/", soapDF); dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/", soapDF); - HTTPTransportFactory httpTransport = new HTTPTransportFactory(); + AbstractHTTPTransportFactory httpTransport = new JettyHTTPTransportFactory(); dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/http", httpTransport); //dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/http", httpTransport); //dfm.registerDestinationFactory("http://cxf.apache.org/bindings/xformat", httpTransport); Modified: incubator/cxf/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/pom.xml (original) +++ incubator/cxf/trunk/pom.xml Wed Apr 4 13:24:19 2007 @@ -410,7 +410,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.0-alpha-3 + 2.0-alpha-4 org.apache.maven.plugins Modified: incubator/cxf/trunk/rt/bindings/http/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/bindings/http/pom.xml (original) +++ incubator/cxf/trunk/rt/bindings/http/pom.xml Wed Apr 4 13:24:19 2007 @@ -71,6 +71,12 @@ + org.apache.cxf + cxf-rt-transports-http-jetty + ${project.version} + test + + org.easymock easymockclassextension test Modified: incubator/cxf/trunk/rt/databinding/aegis/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/pom.xml (original) +++ incubator/cxf/trunk/rt/databinding/aegis/pom.xml Wed Apr 4 13:24:19 2007 @@ -58,6 +58,12 @@ org.apache.cxf + cxf-rt-transports-http-jetty + ${project.version} + test + + + org.apache.cxf cxf-rt-frontend-jaxws ${project.version} test Modified: incubator/cxf/trunk/rt/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/pom.xml (original) +++ incubator/cxf/trunk/rt/pom.xml Wed Apr 4 13:24:19 2007 @@ -41,6 +41,7 @@ frontend/jaxws frontend/js transports/http + transports/http-jetty transports/jms ws/policy ws/addr Propchange: incubator/cxf/trunk/rt/transports/http-jetty/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Apr 4 13:24:19 2007 @@ -0,0 +1,10 @@ +.pmd +.checkstyle +.ruleset +target +.settings +.classpath +.project +.wtpmodules + + Copied: incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (from r525540, incubator/cxf/trunk/rt/transports/http/pom.xml) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/pom.xml?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/pom.xml&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/pom.xml&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/pom.xml (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Wed Apr 4 13:24:19 2007 @@ -19,10 +19,10 @@ 4.0.0 org.apache.cxf - cxf-rt-transports-http + cxf-rt-transports-http-jetty jar 2.0-incubator-RC-SNAPSHOT - Apache CXF Runtime HTTP transport + Apache CXF Runtime HTTP Jetty transport http://cwiki.apache.org/CXF @@ -50,6 +50,11 @@ org.apache.cxf + cxf-rt-transports-http + ${project.version} + + + org.apache.cxf cxf-rt-core ${project.version} @@ -85,66 +90,10 @@ - - - - org.apache.cxf - cxf-common-xsd - ${project.version} - - - generate-sources - generate-sources - - ${basedir}/target/generated/src/main/java - - - ${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd - ${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb - - ${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl - - - - ${basedir}/src/main/resources/schemas/configuration/http-listener.xsd - ${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb - true - - -Xdv - - - ${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl - ${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security - - - - - - xsdtojava - - - - - - org.apache.cxf - cxf-xjc-dv - ${project.version} - - - org.apache.cxf - cxf-common-utilities - ${project.version} - - - - - - - - scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/transports/http - scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/transports/http + scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/transports/http-jetty + scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/rt/transports/http-jetty Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyConnectorFactory.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java Wed Apr 4 13:24:19 2007 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import org.mortbay.jetty.AbstractConnector; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyContextInspector.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyContextInspector.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyContextInspector.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java Wed Apr 4 13:24:19 2007 @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import org.apache.cxf.endpoint.ContextInspector; import org.mortbay.jetty.handler.ContextHandler; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Wed Apr 4 13:24:19 2007 @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import java.io.IOException; import java.io.InputStream; @@ -35,6 +34,7 @@ import org.apache.cxf.message.MessageImpl; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.ConduitInitiator; +import org.apache.cxf.transport.http.AbstractHTTPDestination; import org.apache.cxf.transport.https.SSLUtils; import org.apache.cxf.transports.http.QueryHandler; import org.apache.cxf.transports.http.QueryHandlerRegistry; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPHandler.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPHandler.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPHandler.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java Wed Apr 4 13:24:19 2007 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import java.io.IOException; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import java.net.URL; import java.util.HashMap; @@ -250,7 +250,7 @@ } private void retrieveListenerFactory() { - connectorFactory = HTTPTransportFactory.getConnectorFactory(getSslServer()); + connectorFactory = JettyHTTPTransportFactory.getConnectorFactory(getSslServer()); } private void init(SSLServerPolicy sslServerPolicy) { Added: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java?view=auto&rev=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java (added) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java Wed Apr 4 13:24:19 2007 @@ -0,0 +1,67 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.transport.http_jetty; + +import java.io.IOException; + +import javax.annotation.Resource; + +import org.apache.cxf.Bus; +import org.apache.cxf.configuration.security.SSLServerPolicy; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.Destination; +import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; +import org.apache.cxf.transport.https_jetty.JettySslConnectorFactory; + +import org.mortbay.jetty.AbstractConnector; +import org.mortbay.jetty.nio.SelectChannelConnector; + + +public class JettyHTTPTransportFactory extends AbstractHTTPTransportFactory { + public JettyHTTPTransportFactory() { + super(); + + } + + @Resource(name = "bus") + public void setBus(Bus b) { + super.setBus(b); + } + + @Override + public Destination getDestination(EndpointInfo endpointInfo) throws IOException { + JettyHTTPDestination destination = new JettyHTTPDestination(getBus(), this, endpointInfo); + configure(destination); + destination.retrieveEngine(); + return destination; + } + + protected static JettyConnectorFactory getConnectorFactory(SSLServerPolicy policy) { + return policy == null + ? new JettyConnectorFactory() { + public AbstractConnector createConnector(int port) { + SelectChannelConnector result = new SelectChannelConnector(); + //SocketConnector result = new SocketConnector(); + result.setPort(port); + return result; + } + } + : new JettySslConnectorFactory(policy); + } +} Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPTransportFactory.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?view=auto&rev=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties (added) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties Wed Apr 4 13:24:19 2007 @@ -0,0 +1,23 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +UNEXPECTED_RESPONSE_TYPE_MSG = Unexpected response type {0} +NULL_RESPONSE_MSG = Response object is null +DECOUPLED_RESPONSE_FAILED_MSG = Decouple response failed Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ServerEngine.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ServerEngine.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ServerEngine.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import java.net.URL; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/JettySslConnectorFactory.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/JettySslConnectorFactory.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/JettySslConnectorFactory.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.https; +package org.apache.cxf.transport.https_jetty; import java.util.logging.Handler; import java.util.logging.Level; @@ -27,7 +27,8 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.security.SSLServerPolicy; -import org.apache.cxf.transport.http.JettyConnectorFactory; +import org.apache.cxf.transport.http_jetty.JettyConnectorFactory; +import org.apache.cxf.transport.https.SSLUtils; import org.mortbay.jetty.AbstractConnector; import org.mortbay.jetty.security.SslSocketConnector; Added: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties?view=auto&rev=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties (added) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties Wed Apr 4 13:24:19 2007 @@ -0,0 +1,72 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +SSL_CONTEXT_INIT_FAILURE = Problem initializing ssl for the outbound request, exception reported from security provider is : {0} +UNKNOWN_SSL_CLIENT_POLICY_DATA = Unknown SSLClientPolicy property : {0} +UNKNOWN_SSL_SERVER_POLICY_DATA = Unknown SSLServerPolicy property : {0} +UNSUPPORTED_SSL_CLIENT_POLICY_DATA = Unsupported SSLClientPolicy property : {0} +UNSUPPORTED_SSL_SERVER_POLICY_DATA = Unsupported SSLServerPolicy property : {0} +KEY_STORE_NOT_SET = The location of the key store has not been set via a system parameter or through configuration so the default value of {0} will be used. +KEY_STORE_SET = The keystore location is set to {0}. +KEY_STORE_SYSTEM_PROPERTY_SET = The keystore location is set via a system property to {0}. +KEY_STORE_TYPE_NOT_SET = The key store type has not been set in configuration so the default value of {0} will be used. +KEY_STORE_TYPE_SET = The key store type has been set in configuration to {0}. +LOADED_KEYSTORE = Successfully loaded keystore, {0}. +FAILED_TO_LOAD_KEYSTORE = Loading the keystore {0}, failed with the following problem: {1}. +FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD = Loading the keystore. {0}, failed becasue the password is not set. +TRUST_STORE_NOT_SET = The location of the trust store has not been set via a system parameter or through configuration so the default value of {0} will be used. +TRUST_STORE_SET = The trust store location has been set in configuration to {0}. +TRUST_STORE_SYSTEM_PROPERTY_SET = The trust store location has been via a system property to {0}. +TRUST_STORE_TYPE_NOT_SET = The trust store type has not been set in configuration so the default value of {0} will be used. +TRUST_STORE_TYPE_SET = The trust store type has been set in configuration to {0}. +FAILED_TO_LOAD_TRUST_STORE = Loading the truststore, {0}, failed with the following problem: {1}. +LOADED_TRUST_STORE = Successfully loaded trust store, {0}. +KEY_STORE_PASSWORD_NOT_SET = The key store password has not been set via a system property or through configuration, reading data from the keystore will fail. +KEY_STORE_PASSWORD_SET = The key store password was found to be set in configuration and will be used. +KEY_STORE_PASSWORD_SYSTEM_PROPERTY_SET = The key store password was found to be set as a system property and will be used. +KEY_PASSWORD_NOT_SET = The key password has not been set via a system property or through configuration, reading data from the keystore will fail. +KEY_PASSWORD_SET = The key password was found to be set in configuration and will be used. +KEY_PASSWORD_SYSTEM_PROPERTY_SET = The key password was found to be set as a system property and will be used. +SECURE_SOCKET_PROTOCOL_NOT_SET = The secure socket protocol is not set so using default value TLSv1. +SECURE_SOCKET_PROTOCOL_SET = The secure socket protocol has been set to {0}. +REQUIRE_CLIENT_AUTHENTICATION_NOT_SET = Require client authentication has not been set explicitly in configuration so defaulting to false. +REQUIRE_CLIENT_AUTHENTICATION_SET = Require client authentication is set to {0}. +WANT_CLIENT_AUTHENTICATION_NOT_SET = Want client authentication has not been set explicitly in configuration so defaulting to false. +WANT_CLIENT_AUTHENTICATION_SET = Want client authentication is set to {0}. +KEY_PASSWORD_NOT_SAME_KEYSTORE_PASSWORD = The value specified for the keystore password is different to the key password. Currently limitations in JSSE requires that they should be the same. The keystore password value will be used only. +CIPHERSUITES_SET = The cipher suites have been set to {0}. +CIPHERSUITES_NOT_SET = The cipher suites have not been configured, falling back to cipher suite filters. +CIPHERSUITE_FILTERS_NOT_SET = The cipher suite filters have not been configured, falling back to default filters. +CIPHERSUITE_FILTER = Ciphersuite filter: +CIPHERSUITE_INCLUDED = The {0} cipher suite is included by the filter. +CIPHERSUITE_EXCLUDED = The {0} cipher suite is excluded by the filter. +CIPHERSUITE_INCLUDE_FILTER = Ciphersuite include filter: {0} +CIPHERSUITE_EXCLUDE_FILTER = Ciphersuite exclude filter: {0} +CIPHERSUITES_FILTERED = The enabled cipher suites have been filtered down to {0}. +CIPHERSUITES_EXCLUDED = The excluded cipher suites have been filtered down to {0}. +SUCCESS_INVOKING_SECURITY_CONFIGURER = The custom security configurer {0} configure method was called successfully. +ERROR_INVOKING_SECURITY_CONFIGURER = Failure invoking on custom security configurer {0}, exception reported is {1}. +KEY_STORE_ALGORITHM_NOT_SET = The keystore key manager factory algorithm has not been set in configuration so the default value {0} will be used. +KEY_STORE_ALGORITHM_SET = The keystore key manager factory algorithm has been set in configuration to {0}. +TRUST_STORE_ALGORITHM_NOT_SET = The truststore key manager factory algorithm has not been set in configuration so the default value {0} will be used. +TRUST_STORE_ALGORITHM_SET = The trust store key manager factory algorithm has been set in configuration to {0}. +COULD_NOT_CREATE_OUTBOUND_REQUEST_SOCKET = Failed to create a connection to host {0} and port {1}, error reported is {2}. +PROBLEM_CREATING_OUTBOUND_REQUEST_SOCKET = Failed to create a connection to host {0} and port {1}. +UNOFFICIAL_SECURITY_CONFIGURER = Use of the security configurer is supported for version 1.0 of Celtix but the API is subject to change in later versions. Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/Messages.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/bus-extensions.xml) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/bus-extensions.xml&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/bus-extensions.xml (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml Wed Apr 4 13:24:19 2007 @@ -19,7 +19,7 @@ --> - + http://schemas.xmlsoap.org/wsdl/soap/http http://schemas.xmlsoap.org/soap/http http://www.w3.org/2003/05/soap/bindings/HTTP/ Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml Wed Apr 4 13:24:19 2007 @@ -23,7 +23,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + @@ -36,8 +36,4 @@ - - - - Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyContextInspectorTest.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyContextInspectorTest.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyContextInspectorTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import org.easymock.classextension.EasyMock; import org.easymock.classextension.IMocksControl; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import java.io.ByteArrayOutputStream; @@ -48,6 +48,7 @@ import org.apache.cxf.transport.Conduit; import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.MessageObserver; +import org.apache.cxf.transport.http.WSDLQueryHandler; import org.apache.cxf.transports.http.QueryHandler; import org.apache.cxf.transports.http.QueryHandlerRegistry; import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPServerEngineTest.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPServerEngineTest.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPServerEngineTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java Wed Apr 4 13:24:19 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cxf.transport.http; +package org.apache.cxf.transport.http_jetty; import org.apache.cxf.Bus; @@ -94,7 +94,7 @@ @Test public void testSSLServerPolicySetFromConfig() { - setUpConfigurer("/org/apache/cxf/transport/http/cxfcfg.xml"); + setUpConfigurer("/org/apache/cxf/transport/http_jetty/cxfcfg.xml"); JettyHTTPServerEngine engine = JettyHTTPServerEngine.getForPort(bus, "http", 1234); assertTrue("SSLServerPolicy must be set", engine.isSetSslServer()); Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/cxfcfg.xml (from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/cxfcfg.xml?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/cxfcfg.xml&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/cxfcfg.xml Wed Apr 4 13:24:19 2007 @@ -23,7 +23,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?view=diff&rev=525597&r1=525540&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Wed Apr 4 13:24:19 2007 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.transport.http.spring; +package org.apache.cxf.transport.http_jetty.spring; import javax.xml.namespace.QName; @@ -31,7 +31,7 @@ import org.apache.cxf.transport.Destination; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transport.http.JettyHTTPDestination; +import org.apache.cxf.transport.http_jetty.JettyHTTPDestination; import org.junit.Assert; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -41,10 +41,12 @@ public void testContext() throws Exception { String s1 = getClass().getResource("/META-INF/cxf/cxf.xml").toString(); String s2 = getClass().getResource("/META-INF/cxf/cxf-extension-http.xml").toString(); - String s3 = getClass().getResource("/org/apache/cxf/transport/http/spring/beans.xml").toString(); + String s3 = getClass().getResource("/META-INF/cxf/cxf-extension-http-jetty.xml").toString(); + String s4 = getClass() + .getResource("/org/apache/cxf/transport/http_jetty/spring/beans.xml").toString(); ClassPathXmlApplicationContext ctx = new JaxbClassPathXmlApplicationContext( - new String[] {s1, s2, s3}); + new String[] {s1, s2, s3, s4}); ConfigurerImpl cfg = new ConfigurerImpl(ctx); Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java?view=diff&rev=525597&r1=525540&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/BeanDefinitionParsersTest.java Wed Apr 4 13:24:19 2007 @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.transport.http.spring; +package org.apache.cxf.transport.http_jetty.spring; import org.w3c.dom.Document; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.transport.http.spring.HttpConduitBeanDefinitionParser; +import org.apache.cxf.transport.http.spring.HttpDestinationBeanDefinitionParser; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.junit.Assert; Copied: incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/JettySslConnectorFactoryTest.java (original) +++ incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactoryTest.java Wed Apr 4 13:24:19 2007 @@ -17,17 +17,20 @@ * under the License. */ -package org.apache.cxf.transport.https; +package org.apache.cxf.transport.https_jetty; import java.io.File; import java.net.URISyntaxException; import java.net.URL; import java.util.Properties; +import java.util.logging.Handler; +import java.util.logging.LogRecord; import org.apache.cxf.configuration.security.FiltersType; import org.apache.cxf.configuration.security.ObjectFactory; import org.apache.cxf.configuration.security.SSLServerPolicy; +import org.apache.cxf.transport.https.SSLUtils; //import org.mortbay.jetty.security.SslSelectChannelConnector; import org.junit.After; @@ -38,7 +41,10 @@ public class JettySslConnectorFactoryTest extends Assert { - + protected static final String DROP_BACK_SRC_DIR = + "../../../../../../../../" + + "http/src/test/java/org/apache/cxf/transport/https/"; + private static final String[] EXPORT_CIPHERS = {"SSL_RSA_WITH_NULL_MD5", "SSL_RSA_EXPORT_WITH_RC4_40_MD5", "SSL_RSA_WITH_DES_CBC_SHA"}; private static final String[] NON_EXPORT_CIPHERS = @@ -469,12 +475,42 @@ System.setProperty("user.home", oldHome); } + protected static String getPath(String fileName) throws URISyntaxException { URL keystoreURL = JettySslConnectorFactoryTest.class.getResource("."); String str = keystoreURL.toURI().getPath(); - str += HttpsURLConnectionFactoryTest.DROP_BACK_SRC_DIR + fileName; + str += DROP_BACK_SRC_DIR + fileName; return str; } + + + static class TestLogHandler extends Handler { + String log; + + public TestLogHandler() { + log = ""; + } + + public void publish(LogRecord record) { + log += record.getMessage(); + + } + + public void flush() { + + } + + public void close() throws SecurityException { + + } + + boolean checkLogContainsString(String str) { + if (log.indexOf(str) == -1) { + return false; + } + return true; + } + } } Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Wed Apr 4 13:24:19 2007 @@ -63,7 +63,7 @@ public static final String HTTP_REQUEST = "HTTP.REQUEST"; public static final String HTTP_RESPONSE = "HTTP.RESPONSE"; - private static final Logger LOG = LogUtils.getL7dLogger(JettyHTTPDestination.class); + private static final Logger LOG = LogUtils.getL7dLogger(AbstractHTTPDestination.class); private static final long serialVersionUID = 1L; @@ -327,7 +327,7 @@ /** * Backchannel conduit. */ - protected class BackChannelConduit + public class BackChannelConduit extends AbstractDestination.AbstractBackChannelConduit { protected HttpServletResponse response; @@ -391,7 +391,7 @@ } } - boolean contextMatchOnExact() { + protected boolean contextMatchOnExact() { return "exact".equals(contextMatchStrategy); } Copied: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java (from r525540, incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?view=diff&rev=525597&p1=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java&r1=525540&p2=incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java Wed Apr 4 13:24:19 2007 @@ -37,7 +37,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.configuration.security.SSLClientPolicy; -import org.apache.cxf.configuration.security.SSLServerPolicy; import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.EndpointInfo; @@ -50,16 +49,13 @@ import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.https.HttpsURLConnectionFactory; -import org.apache.cxf.transport.https.JettySslConnectorFactory; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl11.WSDLEndpointFactory; -import org.mortbay.jetty.AbstractConnector; -//import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.nio.SelectChannelConnector; import org.xmlsoap.schemas.wsdl.http.AddressType; -public class HTTPTransportFactory extends AbstractTransportFactory implements ConduitInitiator, - DestinationFactory, WSDLEndpointFactory { +public abstract class AbstractHTTPTransportFactory + extends AbstractTransportFactory + implements ConduitInitiator, DestinationFactory, WSDLEndpointFactory { private static final Set URI_PREFIXES = new HashSet(); static { @@ -117,12 +113,7 @@ return conduit; } - public Destination getDestination(EndpointInfo endpointInfo) throws IOException { - JettyHTTPDestination destination = new JettyHTTPDestination(bus, this, endpointInfo); - configure(destination); - destination.retrieveEngine(); - return destination; - } + public abstract Destination getDestination(EndpointInfo endpointInfo) throws IOException; public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b, Port port) { List ees = port.getExtensibilityElements(); @@ -175,16 +166,5 @@ : new HttpsURLConnectionFactory(policy); } - protected static JettyConnectorFactory getConnectorFactory(SSLServerPolicy policy) { - return policy == null - ? new JettyConnectorFactory() { - public AbstractConnector createConnector(int port) { - SelectChannelConnector result = new SelectChannelConnector(); - //SocketConnector result = new SocketConnector(); - result.setPort(port); - return result; - } - } - : new JettySslConnectorFactory(policy); - } + } Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Wed Apr 4 13:24:19 2007 @@ -146,7 +146,7 @@ protected void retrieveConnectionFactory() { connectionFactory = alternateConnectionFactory != null ? alternateConnectionFactory - : HTTPTransportFactory.getConnectionFactory( + : AbstractHTTPTransportFactory.getConnectionFactory( getSslClient()); } Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Wed Apr 4 13:24:19 2007 @@ -31,7 +31,7 @@ private static final String HTTP_NS = "http://cxf.apache.org/transports/http/configuration"; @Override - protected void doParse(Element element, BeanDefinitionBuilder bean) { + public void doParse(Element element, BeanDefinitionBuilder bean) { bean.setAbstract(true); mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "client"), "client"); mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "proxyAuthorization"), Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java Wed Apr 4 13:24:19 2007 @@ -31,7 +31,7 @@ private static final String HTTP_NS = "http://cxf.apache.org/transports/http/configuration"; @Override - protected void doParse(Element element, BeanDefinitionBuilder bean) { + public void doParse(Element element, BeanDefinitionBuilder bean) { bean.setAbstract(true); mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "server"), "server"); mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslServer"), "sslServer"); Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLUtils.java Wed Apr 4 13:24:19 2007 @@ -83,7 +83,7 @@ private SSLUtils() { } - protected static KeyManager[] getKeyStoreManagers( + public static KeyManager[] getKeyStoreManagers( String keyStoreLocation, String keyStoreType, String keyStorePassword, @@ -142,7 +142,7 @@ return keystoreManagers; } - protected static KeyManager[] loadKeyStore(KeyManagerFactory kmf, + public static KeyManager[] loadKeyStore(KeyManagerFactory kmf, KeyStore ks, ByteArrayInputStream bin, String keyStoreLocation, @@ -560,7 +560,7 @@ } } - protected static void logUnSupportedPolicies(Object policy, + public static void logUnSupportedPolicies(Object policy, boolean client, String[] unsupported, Logger log) { @@ -590,7 +590,7 @@ } } - protected static boolean testAllDataHasSetupMethod(Object policy, + public static boolean testAllDataHasSetupMethod(Object policy, String[] unsupported, String[] derivative) { Method[] sslPolicyMethods = policy.getClass().getDeclaredMethods(); Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml Wed Apr 4 13:24:19 2007 @@ -23,20 +23,6 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - http://schemas.xmlsoap.org/soap/http - http://schemas.xmlsoap.org/wsdl/http/ - http://schemas.xmlsoap.org/wsdl/soap/http - http://www.w3.org/2003/05/soap/bindings/HTTP/ - http://cxf.apache.org/transports/http/configuration - http://cxf.apache.org/bindings/xformat - - - - Modified: incubator/cxf/trunk/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/rt/ws/security/pom.xml (original) +++ incubator/cxf/trunk/rt/ws/security/pom.xml Wed Apr 4 13:24:19 2007 @@ -68,6 +68,12 @@ org.apache.cxf + cxf-tools-common + ${project.version} + test + + + org.apache.cxf cxf-rt-frontend-jaxws ${project.version} test Modified: incubator/cxf/trunk/systests/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/systests/pom.xml (original) +++ incubator/cxf/trunk/systests/pom.xml Wed Apr 4 13:24:19 2007 @@ -112,6 +112,11 @@ org.apache.cxf + cxf-rt-transports-http-jetty + ${project.version} + + + org.apache.cxf cxf-rt-transports-local ${project.version} Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java?view=diff&rev=525597&r1=525596&r2=525597 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Wed Apr 4 13:24:19 2007 @@ -34,7 +34,6 @@ import org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType; import org.apache.hello_world_doc_lit_bare.SOAPService; import org.apache.hello_world_doc_lit_bare.types.TradePriceData; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -43,15 +42,11 @@ private final QName serviceName = new QName("http://apache.org/hello_world_doc_lit_bare", "SOAPService"); private final QName portName = new QName("http://apache.org/hello_world_doc_lit_bare", "SoapPort"); - - @Before - public void setUp() { - System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory"); - } @BeforeClass public static void startServers() throws Exception { + System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory"); assertTrue("server did not launch correctly", launchServer(Server.class)); }