cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r545115 [3/3] - in /incubator/cxf/trunk: common/schemas/src/main/resources/schemas/configuration/ parent/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ rt/transports/http-jetty/ rt/transports/http-jetty/src/main/java/org/...
Date Thu, 07 Jun 2007 09:05:35 GMT
Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd Thu Jun  7 02:05:23 2007
@@ -33,70 +33,143 @@
            jaxb:version="2.0">
 
     <xs:include schemaLocation="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"/> 
-    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
-    <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
+    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" 
+               schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/security" 
+               schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
+    <xs:import namespace="http://www.springframework.org/schema/beans" 
+               schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/beans" 
+               schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
-    <!-- already defined as it can appear in WSDL    
+    <!-- This are already defined as it can appear in WSDL    
     <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
-    -->
-    <xs:element name="authorization" type="sec:AuthorizationPolicy"/>
-    <xs:element name="sslServer" type="sec:SSLServerPolicy"/>
-    <xs:element name="tlsServerParameters" type="sec:TLSServerParametersType"/>
-    <xs:element name="contextMatchStrategy" type="xs:string" default="stem"/>
-    <xs:element name="fixedParameterOrder" type="xs:boolean" default="false"/>
-
-    <!-- already defined as it can appear in WSDL    
     <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
+      ** The following are in the WSDL http-conf.xsd file because
+      ** they need to be generated.
+      ** Destination Specific Items **
+    <xs:element name="contextMatchStrategy" type="xs:string" default="stem"/>
+    <xs:element name="fixedParameterOrder"  type="xs:boolean" default="false"/>
+   
+    <xs:complexType name="ClassOrBeanType">
+       <xs:attribute name="class" type="xs:string"/>
+       <xs:attribute name="bean"  type="xs:string"/>
+    </xs:complexType>
     -->
-    <xs:element name="proxyAuthorization" type="sec:AuthorizationPolicy"/>
-    <xs:element name="sslClient" type="sec:SSLClientPolicy"/>
-    <xs:element name="tlsClientParameters" type="sec:TLSClientParametersType"/>
+    
+    <!-- Conduit Specific Items -->
 
-    <xs:element name="trustDecider"           type="http-conf:ClassOrBeanType"/>
-    <xs:element name="basicAuthSupplier"      type="http-conf:ClassOrBeanType"/>
+    <xs:element name="authorization"       type="sec:AuthorizationPolicy"/>
+    <xs:element name="proxyAuthorization"  type="sec:ProxyAuthorizationPolicy"/>
+    <xs:element name="tlsClientParameters" type="sec:TLSClientParametersType"/>
+    <xs:element name="trustDecider"        type="http-conf:ClassOrBeanType"/>
+    <xs:element name="basicAuthSupplier"   type="http-conf:ClassOrBeanType"/>
+    
     
     <xs:element name="conduit">
       <xs:complexType>
         <xs:complexContent>
           <xs:extension base="beans:identifiedType">
             <xs:all>
-                <xs:element ref="http-conf:client" minOccurs="0"/>
-                <xs:element ref="http-conf:authorization" minOccurs="0"/>
-                <xs:element ref="http-conf:proxyAuthorization" minOccurs="0"/>
-                <xs:element ref="http-conf:sslClient" minOccurs="0"/>
-                <xs:element ref="http-conf:tlsClientParameters" minOccurs="0"/>
+                <xs:element ref="http-conf:client" minOccurs="0">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the parameters that configure
+                       the client side of an Http connection.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
+                <xs:element ref="http-conf:authorization" minOccurs="0">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the parameters that configure
+                       the Basic Authentication that will be premptively
+                       used. Note, supplying a Basic Auth Supplier object
+                       is the preferred approach.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
+                <xs:element ref="http-conf:proxyAuthorization" minOccurs="0">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the parameters that configure
+                       the Basic Authentication for an outgoing Http
+                       Proxy Server.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
+                <xs:element ref="http-conf:tlsClientParameters" minOccurs="0">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the parameters that configure
+                       the underlying SSL/TLS JSSE client side 
+                       of an Https connection.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
                 <xs:element ref="http-conf:basicAuthSupplier" 
-                			minOccurs="0" maxOccurs="1"/>
+                			minOccurs="0" maxOccurs="1">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the bean reference or class name
+                       of an object that supplies Basic Auth information
+                       both prememptively and in response to a 401 Http
+                       Challenge. This class must extend the abstract class 
+                       org.apache.cxf.transport.http.BasicAuthSupplier.
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
                 <xs:element ref="http-conf:trustDecider" 
-                			minOccurs="0" maxOccurs="1"/>
+                			minOccurs="0" maxOccurs="1">
+                   <xs:annotation>
+                     <xs:documentation>
+                       This element holds the bean reference or class name
+                       of an object that checks the Http(s)URLConnection
+                       that will establish trust for a connection with an
+                       Http(s) server, before any information is sent to the
+                       server, namely Basic Auth information. This class
+                       must extend the abstract class
+                       org.apache.cxf.transport.http.MessageTrustDecider. 
+                     </xs:documentation>
+                   </xs:annotation>
+                </xs:element>
             </xs:all>
             <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
           </xs:extension>
         </xs:complexContent>
       </xs:complexType>
     </xs:element>
-   
-    <!-- 
-    <xs:complexType name="ClassOrBeanType">
-       <xs:attribute name="class" type="xs:string"/>
-       <xs:attribute name="bean"  type="xs:string"/>
-    </xs:complexType>
-    -->
     
     <xs:element name="destination">
       <xs:complexType>
         <xs:complexContent>
           <xs:extension base="beans:identifiedType">
             <xs:all>
-              <xs:element ref="http-conf:server" minOccurs="0"/>
-              <xs:element ref="http-conf:authorization" minOccurs="0"/>
-              <xs:element ref="http-conf:sslServer" minOccurs="0"/>
-              <xs:element ref="http-conf:tlsServerParameters" minOccurs="0"/>
-              <xs:element ref="http-conf:contextMatchStrategy" minOccurs="0"/>
-              <xs:element ref="http-conf:fixedParameterOrder" minOccurs="0"/>
-            </xs:all>
+	            <xs:element ref="http-conf:server" minOccurs="0">
+	               <xs:annotation>
+	                 <xs:documentation>
+	                   This element holds the parameters that configure
+	                   the server side of an Http connection.
+	                 </xs:documentation>
+	               </xs:annotation>
+	            </xs:element>
+	            <xs:element ref="http-conf:contextMatchStrategy" minOccurs="0">
+	               <xs:annotation>
+	                 <xs:documentation>
+	                   This element holds the parameters that configure
+	                   the context match strategy for processing an Http request.
+	                 </xs:documentation>
+	               </xs:annotation>
+	            </xs:element>
+	            <xs:element ref="http-conf:fixedParameterOrder" minOccurs="0">
+	               <xs:annotation>
+	                 <xs:documentation>
+	                   This element signifies whether the parameter order of
+	                   an Http request handled by this destination is fixed.
+	                 </xs:documentation>
+	               </xs:annotation>
+	            </xs:element>
+	        </xs:all>
             <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
           </xs:extension>
         </xs:complexContent>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-listener.xsd Thu Jun  7 02:05:23 2007
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-
-<xs:schema targetNamespace="http://cxf.apache.org/transport/http/listener" 
-           xmlns:tns="http://cxf.apache.org/transport/http/listener"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-           xmlns:http-conf="http://cxf.apache.org/transports/http/configuration" 
-           xmlns:sec="http://cxf.apache.org/configuration/security" 
-           xmlns:beans="http://www.springframework.org/schema/beans" 
-           xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
-           elementFormDefault="qualified" 
-           attributeFormDefault="unqualified"
-           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-           jaxb:ersion="2.0">
-
-    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/transports/http/configuration" schemaLocation="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"/>
-    <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
-    <xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
-
-    <!--
-    <xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
-    <xs:element name="sslServer" type="sec:SSLServerPolicy"/>
-    <xs:element name="tlsServerParameters" type="sec:TLSServerParametersType"/>
-    -->
-
-    <xs:element name="listener">
-        <xs:complexType>
-            <xs:complexContent>
-                <xs:extension base="beans:identifiedType">
-                    <xs:sequence>
-                        <xs:element name="listener" type="http-conf:HTTPListenerPolicy" minOccurs="0"/>
-                        <!-- The following element is deprecated in favor of tlsServerParameters -->
-                        <xs:element name="sslServer" type="sec:SSLServerPolicy" minOccurs="0"/>
-                        <xs:element name="tlsServerParameters" type="sec:TLSServerParametersType" minOccurs="0"/>
-                    </xs:sequence>
-                    <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:element>
-
- </xs:schema>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Thu Jun  7 02:05:23 2007
@@ -33,6 +33,13 @@
     <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
     <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
     <xs:element name="listener" type="http-conf:HTTPListenerPolicy"/>
+    <xs:element name="contextMatchStrategy" type="xs:string" default="stem"/>
+    <xs:element name="fixedParameterOrder"  type="xs:boolean" default="false"/>
+    
+    <xs:complexType name="ClassOrBeanType">
+       <xs:attribute name="class" type="xs:string"/>
+       <xs:attribute name="bean"  type="xs:string"/>
+    </xs:complexType>
     
     <xs:complexType name="HTTPServerPolicy">
         <xs:annotation>
@@ -419,15 +426,11 @@
             <xs:enumeration value="Keep-Alive"/>
         </xs:restriction>
     </xs:simpleType>
+    
     <xs:simpleType name="proxyServerType">
         <xs:restriction base="xs:string">
             <xs:enumeration value="HTTP"/>
             <xs:enumeration value="SOCKS"/>
         </xs:restriction>
     </xs:simpleType>
-
-    <xs:complexType name="ClassOrBeanType">
-       <xs:attribute name="class" type="xs:string"/>
-       <xs:attribute name="bean"  type="xs:string"/>
-    </xs:complexType>
  </xs:schema>

Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java Thu Jun  7 02:05:23 2007
@@ -29,7 +29,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.CXFBusImpl;
-import org.apache.cxf.configuration.security.SSLClientPolicy;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -121,7 +121,7 @@
      * This verifys that the underlying connection is an HttpsURLConnection.
      */
     @Test
-    public void testSslClientPolicy() throws Exception {
+    public void testTLSServerParameters() throws Exception {
         Bus bus = new CXFBusImpl();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("https://secure.nowhere.null/" + "bar/foo");
@@ -130,12 +130,12 @@
     
         Message message = getNewMessage();
         // We need an SSL policy, or we can't use "https".
-        conduit.setSslClient(new SSLClientPolicy());
+        conduit.setTlsClientParameters(new TLSClientParameters());
         
         // Test call
         conduit.prepare(message);
         
-        assertTrue("SSL Client Policy should generate an HttpsURLConnection",
+        assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
                 HttpsURLConnection.class.isInstance(
                         message.get("http.connection")));
     }

Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/resources/abigcompany_ca.pem
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/resources/abigcompany_ca.pem?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/resources/abigcompany_ca.pem (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/https/resources/abigcompany_ca.pem Thu Jun  7 02:05:23 2007
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDlTCCAv6gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBlDELMAkGA1UEBhMCSUUx
-DTALBgNVBAgTBExlaW4xDzANBgNVBAcTBkR1YmxpbjEaMBgGA1UEChMRTGFyZ2Ug
-V2lkZ2V0cyBJbmMxFDASBgNVBAsTC0VuZ2luZWVyaW5nMRIwEAYDVQQDEwlsb2Nh
-bGhvc3QxHzAdBgkqhkiG9w0BCQEWEGluZm9AbHdpZGdldHMuaWUwHhcNMDYwNDA2
-MTMzMTU1WhcNMTYwNDAzMTMzMTU1WjCBlDELMAkGA1UEBhMCSUUxDTALBgNVBAgT
-BExlaW4xDzANBgNVBAcTBkR1YmxpbjEaMBgGA1UEChMRTGFyZ2UgV2lkZ2V0cyBJ
-bmMxFDASBgNVBAsTC0VuZ2luZWVyaW5nMRIwEAYDVQQDEwlsb2NhbGhvc3QxHzAd
-BgkqhkiG9w0BCQEWEGluZm9AbHdpZGdldHMuaWUwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAKXQaKoeGRuv9Mt/j8oAlDjL29Rf0XKA0ylHTt9thQ9O6GPiUAzd
-0djHAt0NbIV5f6DmlRfl+KQzri9d+BfywoCTSNoaclp1x5jM/dEjyaCXDPcNzr0l
-7oT1e5V5nLVDJG6qMjxveiQ73kX+IV3EoY8dwiFJALzp4y+1Cslkn08pAgMBAAGj
-gfQwgfEwHQYDVR0OBBYEFNvk101Zxkp0RlKVsvJpCvkcS99kMIHBBgNVHSMEgbkw
-gbaAFNvk101Zxkp0RlKVsvJpCvkcS99koYGapIGXMIGUMQswCQYDVQQGEwJJRTEN
-MAsGA1UECBMETGVpbjEPMA0GA1UEBxMGRHVibGluMRowGAYDVQQKExFMYXJnZSBX
-aWRnZXRzIEluYzEUMBIGA1UECxMLRW5naW5lZXJpbmcxEjAQBgNVBAMTCWxvY2Fs
-aG9zdDEfMB0GCSqGSIb3DQEJARYQaW5mb0Bsd2lkZ2V0cy5pZYIBADAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAHEPllN7pvzOwvCZWUMsnPihjnMibTnk
-26U1OTOxmKrLNUJ0FTqeygZk68SZjBsxyReW1LwXflAAWqBGhm9FlZIxEhceGQe+
-Wxi/9yDfMi0yG6+pC+Tb++nwDaJwU88N8HxNM3ZLDiV4td1AM3dIzHLyVs5Bb+G2
-jSrwuQwUi2F2
------END CERTIFICATE-----

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java Thu Jun  7 02:05:23 2007
@@ -20,20 +20,28 @@
 package org.apache.cxf.systest.http;
 
 
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.configuration.security.FiltersType;
-import org.apache.cxf.configuration.security.SSLClientPolicy;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.message.Message;
@@ -91,7 +99,7 @@
 
     private static final boolean IN_PROCESS = true;
     
-    private static SSLClientPolicy sslClientPolicy = new SSLClientPolicy();
+    private static TLSClientParameters tlsClientParameters = new TLSClientParameters();
     private static Map<String, String> addrMap = new TreeMap<String, String>();
     private static List<String> servers = new ArrayList<String>();
 
@@ -108,25 +116,30 @@
     }
     
     static {
-        String keystore = 
-            Server.class.getResource("resources/Morpit.jks").getFile();
-        //System.out.println("Keystore: " + keystore);
-        String truststore = 
-            Server.class.getResource("resources/Truststore.jks").getFile();
-        //System.out.println("Truststore: " + truststore);
-        sslClientPolicy.setKeystore(keystore);
-        sslClientPolicy.setKeystoreType("JKS");
-        sslClientPolicy.setKeystorePassword("password");
-        sslClientPolicy.setKeyPassword("password");
-        sslClientPolicy.setTrustStore(truststore);
-        sslClientPolicy.setTrustStoreType("JKS");
-        FiltersType filters = new FiltersType();
-        filters.getInclude().add(".*_EXPORT_.*");
-        filters.getInclude().add(".*_EXPORT1024_.*");
-        filters.getInclude().add(".*_WITH_DES_.*");
-        filters.getInclude().add(".*_WITH_NULL_.*");
-        filters.getInclude().add(".*_DH_anon_.*");
-        sslClientPolicy.setCiphersuiteFilters(filters);
+        try {
+            //System.setProperty("javax.net.debug", "all");
+            String keystore = 
+                Server.class.getResource("resources/Morpit.jks").getFile();
+            //System.out.println("Keystore: " + keystore);
+            KeyManager[] kmgrs = getKeyManagers(getKeyStore("JKS", keystore, "password"), "password");
+            
+            String truststore = 
+                Server.class.getResource("resources/Truststore.jks").getFile();
+            //System.out.println("Truststore: " + truststore);
+            TrustManager[] tmgrs = getTrustManagers(getKeyStore("JKS", truststore, "password"));
+            
+            tlsClientParameters.setKeyManagers(kmgrs);
+            tlsClientParameters.setTrustManagers(tmgrs);
+            FiltersType filters = new FiltersType();
+            filters.getInclude().add(".*_EXPORT_.*");
+            filters.getInclude().add(".*_EXPORT1024_.*");
+            filters.getInclude().add(".*_WITH_DES_.*");
+            filters.getInclude().add(".*_WITH_NULL_.*");
+            filters.getInclude().add(".*_DH_anon_.*");
+            tlsClientParameters.setCipherSuitesFilter(filters);
+        } catch (Exception e) {
+            throw new RuntimeException("Static initialization failed", e);
+        }
     }
 
     private final QName serviceName = 
@@ -161,7 +174,7 @@
      * server approach allieviates the pain in starting them all just to run
      * a particular test in the debugger.
      */
-    public static boolean startServer(String name) {
+    public static synchronized boolean startServer(String name) {
         if (servers.contains(name)) {
             return true;
         }
@@ -183,9 +196,62 @@
     public void setUp() {
         // TODO: Do I need this?
         System.setProperty("org.apache.cxf.bus.factory", 
-                "org.apache.cxf.bus.CXFBusFactory");
+            "org.apache.cxf.bus.CXFBusFactory");
+    }
+
+    public static KeyStore getKeyStore(String ksType, String file, String ksPassword)
+        throws GeneralSecurityException,
+               IOException {
+        
+        String type = ksType != null
+                    ? ksType
+                    : KeyStore.getDefaultType();
+                    
+        char[] password = ksPassword != null
+                    ? ksPassword.toCharArray()
+                    : null;
+
+        // We just use the default Keystore provider
+        KeyStore keyStore = KeyStore.getInstance(type);
+        
+        keyStore.load(new FileInputStream(file), password);
+        
+        return keyStore;
+    }
+
+    public static KeyManager[] getKeyManagers(KeyStore keyStore, String keyPassword) 
+        throws GeneralSecurityException,
+               IOException {
+        // For tests, we just use the default algorithm
+        String alg = KeyManagerFactory.getDefaultAlgorithm();
+        
+        char[] keyPass = keyPassword != null
+                     ? keyPassword.toCharArray()
+                     : null;
+        
+        // For tests, we just use the default provider.
+        KeyManagerFactory fac = KeyManagerFactory.getInstance(alg);
+                     
+        fac.init(keyStore, keyPass);
+        
+        return fac.getKeyManagers();
     }
 
+    public static TrustManager[] getTrustManagers(KeyStore keyStore) 
+        throws GeneralSecurityException,
+               IOException {
+        // For tests, we just use the default algorithm
+        String alg = TrustManagerFactory.getDefaultAlgorithm();
+        
+        // For tests, we just use the default provider.
+        TrustManagerFactory fac = TrustManagerFactory.getInstance(alg);
+                     
+        fac.init(keyStore);
+        
+        return fac.getTrustManagers();
+    }
+    
+    
     @Test
     public void testBasicConnection() throws Exception {
         startServer("Mortimer");
@@ -324,6 +390,53 @@
      * to avoid the 401.
      */
     @Test
+    public void testHttpsBasicConnectionWithConfig() throws Exception {
+        startServer("Bethal");
+
+        URL config = getClass().getResource(
+                    "resources/BethalClientConfig.cxf");
+        
+        // We go through the back door, setting the default bus.
+        new DefaultBusFactory().createBus(config);
+        URL wsdl = getClass().getResource("resources/greeting.wsdl");
+        assertNotNull("WSDL is null", wsdl);
+
+        SOAPService service = new SOAPService(wsdl, serviceName);
+        assertNotNull("Service is null", service);
+
+        Greeter bethal = service.getPort(bethalQ, Greeter.class);
+        assertNotNull("Port is null", bethal);
+        
+        // Okay, I'm sick of configuration files.
+        // This also tests dynamic configuration of the conduit.
+        Client client = ClientProxy.getClient(bethal);
+        HTTPConduit http = 
+            (HTTPConduit) client.getConduit();
+        
+        HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+        
+        httpClientPolicy.setAutoRedirect(false);
+        // If we set any name, but Edward, Mary, or George,
+        // and a password of "password" we will get through
+        // Bethal.
+        AuthorizationPolicy authPolicy = new AuthorizationPolicy();
+        authPolicy.setUserName("Betty");
+        authPolicy.setPassword("password");
+        
+        http.setClient(httpClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
+        http.setAuthorization(authPolicy);
+        
+        String answer = bethal.sayHi();
+        assertTrue("Unexpected answer: " + answer, 
+                "Bonjour from Bethal".equals(answer));
+    }
+    /**
+     * This methods tests a basic https connection to Bethal.
+     * It supplies an authorization policy with premetive user/pass
+     * to avoid the 401.
+     */
+    @Test
     public void testHttpsBasicConnection() throws Exception {
         startServer("Bethal");
 
@@ -353,7 +466,7 @@
         authPolicy.setPassword("password");
         
         http.setClient(httpClientPolicy);
-        http.setSslClient(sslClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
         http.setAuthorization(authPolicy);
         
         String answer = bethal.sayHi();
@@ -391,7 +504,7 @@
         httpClientPolicy.setAutoRedirect(true);
         
         http.setClient(httpClientPolicy);
-        http.setSslClient(sslClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
         
         try {
             String answer = poltim.sayHi();
@@ -487,7 +600,7 @@
         authPolicy.setPassword("password");
         
         http.setClient(httpClientPolicy);
-        http.setSslClient(sslClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
         http.setAuthorization(authPolicy);
         
         // Our expected server should be OU=Bethal
@@ -543,7 +656,7 @@
         authPolicy.setPassword("password");
         
         http.setClient(httpClientPolicy);
-        http.setSslClient(sslClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
         http.setAuthorization(authPolicy);
         
         // We get redirected from Tarpin, to Gordy, to Bethal.
@@ -676,7 +789,7 @@
         
         httpClientPolicy.setAutoRedirect(true);
         http.setClient(httpClientPolicy);
-        http.setSslClient(sslClientPolicy);
+        http.setTlsClientParameters(tlsClientParameters);
         
         // We get redirected from Gordy, to Bethal.
         http.setTrustDecider(
@@ -709,3 +822,4 @@
     }
     
 }
+

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf Thu Jun  7 02:05:23 2007
@@ -24,13 +24,20 @@
  -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
     <http:server RedirectURL="http://localhost:9006/Hurlon"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf Thu Jun  7 02:05:23 2007
@@ -25,46 +25,58 @@
   -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination 
     name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
-    
-    <http:sslServer>
-      <sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>
-      <sec:WantClientAuthentication>true</sec:WantClientAuthentication>
-      <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>      
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
-    </http:sslServer>
-   </http:destination>
+  </http:destination>
   
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
+  <httpj:engine-factory bus="cxf">
+	 <httpj:engine port="9002">
+	     <httpj:tlsServerParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	      <sec:clientAuthentication want="true" required="true"/>
+	    </httpj:tlsServerParameters>
+	  </httpj:engine>
+   </httpj:engine-factory>
+  
+   <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
         <property name="inInterceptors">
             <list>
                 <bean class="org.apache.cxf.systest.http.PushBack401"/>
             </list>
         </property>
-    </bean> 
+   </bean> 
 
 </beans>

Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf?view=auto&rev=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf (added)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf Thu Jun  7 02:05:23 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+ 
+   <http:conduit name="{http://apache.org/hello_world}Bethal.http-conduit">
+
+	   <http:tlsClientParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	  </http:tlsClientParameters>
+	  <http:authorization>
+	     <sec:UserName>Betty</sec:UserName>
+	     <sec:Password>password</sec:Password>
+	  </http:authorization>
+      <http:client AutoRedirect="false"/>
+    
+   </http:conduit>
+
+</beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf Thu Jun  7 02:05:23 2007
@@ -23,38 +23,55 @@
   ** It is an https server that redirects to Bethal.
  -->
 
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination 
+         name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
     <http:server RedirectURL="https://localhost:9002/Bethal"/>
-    <http:sslServer>
-      <sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>
-      <sec:WantClientAuthentication>true</sec:WantClientAuthentication>
-      <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
-    </http:sslServer>    
   </http:destination>
   
+  <httpj:engine-factory bus="cxf">
+	 <httpj:engine port="9001">
+	     <httpj:tlsServerParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	      <sec:clientAuthentication want="true" required="true"/>
+	    </httpj:tlsServerParameters>
+	  </httpj:engine>
+   </httpj:engine-factory>
+   
+  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
+  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf Thu Jun  7 02:05:23 2007
@@ -18,14 +18,20 @@
   under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
  
    <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf Thu Jun  7 02:05:23 2007
@@ -7,9 +7,9 @@
   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
@@ -17,15 +17,26 @@
   specific language governing permissions and limitations
   under the License.
 -->
+
+<!-- 
+  ** This file configures the Http2HttpRedirect Client.
+ -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
  
    <http:conduit name="{http://apache.org/hello_world}Rethwel.http-conduit">
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf Thu Jun  7 02:05:23 2007
@@ -23,15 +23,22 @@
   ** It is an http server that redirects to Abost.
  -->
 
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
     <http:server RedirectURL="http://localhost:9007/Abost"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf Thu Jun  7 02:05:23 2007
@@ -23,37 +23,53 @@
   ** Https server with a name that will kick in the HostnameVerifier.
  -->
 
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
-    <http:sslServer>
-      <sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>
-      <sec:WantClientAuthentication>true</sec:WantClientAuthentication>
-      <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>      
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
-    </http:sslServer>
   </http:destination>
-
+  
+  <httpj:engine-factory bus="cxf">
+	 <httpj:engine port="9008">
+	     <httpj:tlsServerParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	      <sec:clientAuthentication want="true" required="true"/>
+	    </httpj:tlsServerParameters>
+	  </httpj:engine>
+   </httpj:engine-factory>  
+  
+  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
+  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf Thu Jun  7 02:05:23 2007
@@ -23,16 +23,22 @@
   ** It is an http server.
   -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
     <!-- Nothing to Configure here for Mortimer -->

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf Thu Jun  7 02:05:23 2007
@@ -23,39 +23,55 @@
   ** It is an https server that redirects to Mortimer.
  -->
 
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
-    <http:sslServer>
-      <sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>
-      <sec:WantClientAuthentication>true</sec:WantClientAuthentication>
-      <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>      
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
-    </http:sslServer>
     <http:server RedirectURL="http://localhost:9000/Mortimer"/>
   </http:destination>
   
+  <httpj:engine-factory bus="cxf">
+	 <httpj:engine port="9005">
+	     <httpj:tlsServerParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	      <sec:clientAuthentication want="true" required="true"/>
+	    </httpj:tlsServerParameters>
+	  </httpj:engine>
+   </httpj:engine-factory>  
+  
+  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
+  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf Thu Jun  7 02:05:23 2007
@@ -23,16 +23,22 @@
   ** It is an http server that redirects to Mortimer.
  -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf Thu Jun  7 02:05:23 2007
@@ -23,39 +23,55 @@
   ** It is an https server that redirects to Gordy.
  -->
 
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+  		   http://cxf.apache.org/configuration/security
+  		      http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/transports/http/configuration
+              http://cxf.apache.org/schemas/configuration/http-conf.xsd
+           http://cxf.apache.org/transports/http-jetty/configuration
+              http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+           http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
     <http:server RedirectURL="https://localhost:9001/Gordy"/>
-    <http:sslServer>
-      <sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>
-      <sec:WantClientAuthentication>true</sec:WantClientAuthentication>
-      <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>      
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
-    </http:sslServer>    
   </http:destination>
   
+  <httpj:engine-factory bus="cxf">
+	 <httpj:engine port="9003">
+	     <httpj:tlsServerParameters>
+	      <sec:keyManagers keyPassword="password">
+	           <sec:keyStore type="JKS" password="password" 
+	                file="src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks"/>
+	      </sec:keyManagers>
+	      <sec:trustManagers>
+	          <sec:keyStore type="JKS" password="password"
+	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+	      </sec:trustManagers>
+	      <sec:cipherSuitesFilter>
+	        <!-- these filters ensure that a ciphersuite with
+	          export-suitable or null encryption is used,
+	          but exclude anonymous Diffie-Hellman key change as
+	          this is vulnerable to man-in-the-middle attacks -->
+	        <sec:include>.*_EXPORT_.*</sec:include>
+	        <sec:include>.*_EXPORT1024_.*</sec:include>
+	        <sec:include>.*_WITH_DES_.*</sec:include>
+	        <sec:include>.*_WITH_NULL_.*</sec:include>
+	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+	      </sec:cipherSuitesFilter>
+	      <sec:clientAuthentication want="true" required="true"/>
+	    </httpj:tlsServerParameters>
+	  </httpj:engine>
+   </httpj:engine-factory>  
+  
+  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
+  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
 </beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml Thu Jun  7 02:05:23 2007
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xmlns:sec="http://cxf.apache.org/configuration/security"
-       xsi:schemaLocation="
-            http://cxf.apache.org/transports/http/configuration 
-                http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://www.springframework.org/schema/beans 
-                http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-<!--
-http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
--->
-
-   <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-       
-    <http:client AutoRedirect="true"/>
-    
-    <http:sslClient>
-      <sec:Keystore>src/demo/hw/resources/Bethal.jks</sec:Keystore>
-      <sec:KeystoreType>JKS</sec:KeystoreType>
-      <sec:KeystorePassword>password</sec:KeystorePassword>
-      <sec:KeyPassword>password</sec:KeyPassword>      
-      <sec:CiphersuiteFilters>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable but non-null encryption is used,
-          and prefers the stronger SHA over MD5 message digests -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:exclude>.*_WITH_NULL_.*</sec:exclude>
-        <sec:exclude>.*_MD5</sec:exclude>
-      </sec:CiphersuiteFilters>
-      <sec:TrustStore>src/demo/hw/resources/Truststore.jks</sec:TrustStore>
-    </http:sslClient>
-    
-    <!--
-    <http:basicAuthSupplier 
-    	class="org.apache.cxf.systest.http.UserPassSupplier"/>
-    	-->
-    	
-    <http:trustDecider
-    	class="org.apache.cxf.systest.http.TrustHandler"/>  	
-  </http:conduit>
-
-</beans>

Modified: incubator/cxf/trunk/tools/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/pom.xml?view=diff&rev=545115&r1=545114&r2=545115
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/pom.xml Thu Jun  7 02:05:23 2007
@@ -72,7 +72,7 @@
         <dependency>
 	     <groupId>org.mortbay.jetty</groupId>
 	     <artifactId>jetty</artifactId>
-	     <version>6.1.2rc0</version>
+	     <version>${jetty.version}</version>
 	     <scope>test</scope>
 	</dependency>
 



Mime
View raw message