cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r501982 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/configuration/spring/ rt/core/src/main/java/org/apache/cxf/bus/spring/ rt/core/src/main/java/org/apache/cxf/configuration/spring/ rt/frontend/jaxws/src/main/java/...
Date Wed, 31 Jan 2007 20:47:01 GMT
Author: dandiep
Date: Wed Jan 31 12:46:59 2007
New Revision: 501982

URL: http://svn.apache.org/viewvc?view=rev&rev=501982
Log:
Start of migration to support Spring 2.0 NamespaceHandlers instead of
our own property editor mechanism. This allows a much more compact syntax:

    <h:conduit id="{urn:test:ns}Foo.http-conduit">
      <h:client ConnectionTimeout="97"/>
    </h:conduit>

It also means that people won't have to use our custom ApplicationContext.
As part of this I consolidated the conduit and configuration schemas into the 
http-conf schema. Otherwise people would have to use multiple namespaces to 
write their configuration which was annoying and confusing.

I'm not sure I'm happy with our configuration syntax though. It has mix 
conventions for naming things (some start with an upper case letter and some
do not). Also, it still seems overly verbose/redundat. Not sure what the
best strategy is here though.

Also, I changed the SpringBusFactory/BusApplicationContext so we didn't refresh()
twice as the logging was a bit annoying.

Added:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers   (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas   (with props)
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/cxfcfg.xml
      - copied unchanged from r501836, incubator/cxf/trunk/rt/transports/http/src/main/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/http/spring/ApplicationContextTest.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java   (with props)
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml   (with props)
Removed:
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/cxfcfg.xml
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-property-editors.xml
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-conduit.xsd
    incubator/cxf/trunk/rt/transports/http/src/main/resources/schemas/configuration/http-destination.xsd
Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/JaxbClassPathXmlApplicationContext.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointBeanDefinitionParser.java
    incubator/cxf/trunk/rt/transports/http/pom.xml
    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/HTTPTransportFactory.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/resources/schemas/wsdl/http-conf.xsd
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/concurrent.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/nonanonymous-deferred.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-deferred.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-message-loss.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer-test.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-seqlength2.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway.xml

Added: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (added)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,88 @@
+/**
+ * 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.configuration.spring;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.util.StringUtils;
+
+public abstract class AbstractBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+    
+    protected void mapElementToJaxbProperty(Element parent, BeanDefinitionBuilder bean, QName name,
+                                            String string) {
+        Node data = null;
+        NodeList nl = parent.getChildNodes();
+        for (int i = 0; i < nl.getLength(); i++) {
+            Node n = nl.item(i);
+            if (n.getNodeType() == Node.ELEMENT_NODE && name.getLocalPart().equals(n.getLocalName())
+                && name.getNamespaceURI().equals(n.getNamespaceURI())) {
+                data = n;
+                break;
+            }
+        }
+
+        if (data == null) {
+            return;
+        }
+
+        JAXBContext context = null;
+        Object obj = null;
+        try {
+            context = JAXBContext.newInstance(getJaxbPackage(), 
+                                              getClass().getClassLoader());
+            Unmarshaller u = context.createUnmarshaller();
+            obj = u.unmarshal(data);
+            if (obj instanceof JAXBElement<?>) {
+                JAXBElement<?> el = (JAXBElement<?>)obj;
+                obj = el.getValue();
+
+            }
+        } catch (JAXBException e) {
+            throw new RuntimeException("Could not parse configuration.", e);
+        }
+
+        if (obj != null) {
+            bean.addPropertyValue(string, obj);
+        }
+    }
+
+    protected String getJaxbPackage() {
+        return "";
+    }
+    
+    protected void mapAttributeToProperty(Element element, 
+                                          BeanDefinitionBuilder bean, 
+                                          String attrName,
+                                          String propertyName) {
+        String cls = element.getAttribute(attrName);
+        if (StringUtils.hasText(cls)) {
+            bean.addPropertyValue(propertyName, cls);
+        }
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java Wed Jan 31 12:46:59 2007
@@ -59,7 +59,7 @@
     }
 
     BusApplicationContext(String cf, boolean include, ApplicationContext parent) {
-        super((String[])null, parent);
+        super((String[])null, parent, false);
         cfgFile = cf;
         includeDefaults = include;
     }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/JaxbClassPathXmlApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/JaxbClassPathXmlApplicationContext.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/JaxbClassPathXmlApplicationContext.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/JaxbClassPathXmlApplicationContext.java Wed Jan 31 12:46:59 2007
@@ -55,7 +55,13 @@
     
     public JaxbClassPathXmlApplicationContext(String[] locations, ApplicationContext parent) 
         throws BeansException {
-        super(locations, parent);
+        this(locations, parent, true);
+    }
+    
+    public JaxbClassPathXmlApplicationContext(String[] locations, ApplicationContext parent, boolean refresh) 
+        throws BeansException {
+        super(locations, refresh);
+        setParent(parent);
         cfgFileLocations = locations;
     }
     

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointBeanDefinitionParser.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointBeanDefinitionParser.java Wed Jan 31 12:46:59 2007
@@ -20,26 +20,15 @@
 
 import org.w3c.dom.Element;
 
+import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.util.StringUtils;
 
-public class EndpointBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+public class EndpointBeanDefinitionParser extends AbstractBeanDefinitionParser {
 
     @Override
     protected void doParse(Element element, BeanDefinitionBuilder bean) {
         mapAttributeToProperty(element, bean, "class", "serviceClass");
-    }
-
-    private void mapAttributeToProperty(Element element, 
-                                        BeanDefinitionBuilder bean,
-                                        String attrName,
-                                        String propertyName) {
-        String cls = element.getAttribute(attrName);
-        if (StringUtils.hasText(cls)) {
-            bean.addPropertyValue(propertyName, cls);
-        }
     }
 
     @Override

Modified: incubator/cxf/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/pom.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http/pom.xml Wed Jan 31 12:46:59 2007
@@ -99,30 +99,6 @@
                                     </deleteDirs>
                                 </xsdOption>
                                 <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/http-conduit.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>
-                                    </extensionArgs>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/http-destination.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>                                   
-                                    </extensionArgs>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-                                <xsdOption>
                                     <xsd>${basedir}/src/main/resources/schemas/configuration/http-listener.xsd</xsd>
                                     <bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
                                     <extension>true</extension>

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=501982&r1=501981&r2=501982
==============================================================================
--- 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 Jan 31 12:46:59 2007
@@ -32,27 +32,33 @@
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.configuration.security.SSLServerPolicy;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.AbstractDestination;
 import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.http.destination.HTTPDestinationConfigBean;
 import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
 
 /**
  * Common base for HTTP Destination implementations.
  */
-public abstract class AbstractHTTPDestination extends AbstractDestination {
+public abstract class AbstractHTTPDestination extends AbstractDestination implements Configurable {
     
     private static final long serialVersionUID = 1L;
 
     protected final Bus bus;
     protected final ConduitInitiator conduitInitiator;
-    protected HTTPDestinationConfigBean config;
     protected String name;
     protected URL nurl;
 
+    // Configuration values
+    protected HTTPServerPolicy server;
+    protected AuthorizationPolicy authorization;
+    protected SSLServerPolicy sslServer;
+    protected String contextMatchStrategy = "stem";
+    protected boolean fixedParameterOrder;
+    
     /**
      * Constructor
      * 
@@ -143,12 +149,12 @@
     }        
 
     private void initConfig() {
-        config = new ConfigBean();
-        config.setServer(endpointInfo.getTraversedExtensor(new HTTPServerPolicy(), HTTPServerPolicy.class));
+        this.server = endpointInfo.getTraversedExtensor(new HTTPServerPolicy(), HTTPServerPolicy.class);
+        this.sslServer = endpointInfo.getTraversedExtensor(null, SSLServerPolicy.class);
     }
 
     void setPolicies(Map<String, List<String>> headers) {
-        HTTPServerPolicy policy = config.getServer(); 
+        HTTPServerPolicy policy = server; 
         if (policy.isSetCacheControl()) {
             headers.put("Cache-Control",
                         Arrays.asList(new String[] {policy.getCacheControl().value()}));
@@ -182,16 +188,54 @@
     }
 
     boolean contextMatchOnExact() {
-        return "exact".equals(config.getContextMatchStrategy());
+        return "exact".equals(contextMatchStrategy);
     }    
 
-    private class ConfigBean extends HTTPDestinationConfigBean implements Configurable {
-        public String getBeanName() {
-            String beanName = null;
-            if (endpointInfo.getName() != null) {
-                beanName = endpointInfo.getName().toString() + ".http-destination";
-            }
-            return beanName;
+    public String getBeanName() {
+        String beanName = null;
+        if (endpointInfo.getName() != null) {
+            beanName = endpointInfo.getName().toString() + ".http-destination";
         }
+        return beanName;
+    }
+
+    public AuthorizationPolicy getAuthorization() {
+        return authorization;
+    }
+
+    public void setAuthorization(AuthorizationPolicy authorization) {
+        this.authorization = authorization;
+    }
+
+    public String getContextMatchStrategy() {
+        return contextMatchStrategy;
+    }
+
+    public void setContextMatchStrategy(String contextMatchStrategy) {
+        this.contextMatchStrategy = contextMatchStrategy;
+    }
+
+    public boolean isFixedParameterOrder() {
+        return fixedParameterOrder;
+    }
+
+    public void setFixedParameterOrder(boolean fixedParameterOrder) {
+        this.fixedParameterOrder = fixedParameterOrder;
+    }
+
+    public HTTPServerPolicy getServer() {
+        return server;
+    }
+
+    public void setServer(HTTPServerPolicy server) {
+        this.server = server;
+    }
+
+    public SSLServerPolicy getSslServer() {
+        return sslServer;
+    }
+
+    public void setSslServer(SSLServerPolicy sslServer) {
+        this.sslServer = sslServer;
     }
 }

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=501982&r1=501981&r2=501982
==============================================================================
--- 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 Jan 31 12:46:59 2007
@@ -41,6 +41,7 @@
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.configuration.security.SSLClientPolicy;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
 import org.apache.cxf.io.AbstractWrappedOutputStream;
@@ -53,7 +54,6 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.http.conduit.HTTPConduitConfigBean;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -67,13 +67,12 @@
 /**
  * HTTP Conduit implementation.
  */
-public class HTTPConduit extends AbstractConduit {
+public class HTTPConduit extends AbstractConduit implements Configurable {
     
     public static final String HTTP_CONNECTION = "http.connection";
     private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);
     
     private final Bus bus;
-    private HTTPConduitConfigBean config;
     private final URLConnectionFactory alternateConnectionFactory;
     private URLConnectionFactory connectionFactory;
     private URL url;
@@ -83,6 +82,12 @@
     private DecoupledDestination decoupledDestination;
     private EndpointInfo endpointInfo;
     
+    // COnfiguration values
+    private HTTPClientPolicy client;
+    private AuthorizationPolicy authorization;
+    private AuthorizationPolicy proxyAuthorization;
+    private SSLClientPolicy sslClient;
+
 
     /**
      * Constructor
@@ -154,14 +159,7 @@
         connectionFactory = alternateConnectionFactory != null
                             ? alternateConnectionFactory
                             : HTTPTransportFactory.getConnectionFactory(
-                                  config.getSslClient());
-    }
-    
-    /**
-     * @return the encapsulated config bean
-     */
-    protected HTTPConduitConfigBean getConfig() {
-        return config;
+                                  getSslClient());
     }
         
     /**
@@ -176,8 +174,8 @@
             connectionFactory.createConnection(getProxy(), currentURL);
         connection.setDoOutput(true);        
         //TODO using Message context to deceided HTTP send properties        
-        connection.setConnectTimeout((int)config.getClient().getConnectionTimeout());
-        connection.setReadTimeout((int)config.getClient().getReceiveTimeout());
+        connection.setConnectTimeout((int)getClient().getConnectionTimeout());
+        connection.setReadTimeout((int)getClient().getReceiveTimeout());
         connection.setUseCaches(false);
         
         if (connection instanceof HttpURLConnection) {
@@ -188,14 +186,14 @@
             } else {
                 hc.setRequestMethod("POST");
             }
-            if (config.getClient().isAutoRedirect()) {
+            if (getClient().isAutoRedirect()) {
                 //cannot use chunking if autoredirect as the request will need to be
                 //completely cached locally and resent to the redirect target
                 hc.setInstanceFollowRedirects(true);
             } else {
                 hc.setInstanceFollowRedirects(false);
                 if (!hc.getRequestMethod().equals("GET")
-                        && config.getClient().isAllowChunking()) {
+                        && getClient().isAllowChunking()) {
                     hc.setChunkedStreamingMode(2048);
                 }
             }
@@ -232,7 +230,7 @@
     @Override
     public synchronized Destination getBackChannel() {
         if (decoupledDestination == null
-            && config.getClient().getDecoupledEndpoint() != null) {
+            && getClient().getDecoupledEndpoint() != null) {
             decoupledDestination = setUpDecoupledDestination(); 
         }
         return decoupledDestination;
@@ -366,7 +364,7 @@
     private DecoupledDestination setUpDecoupledDestination() {        
         EndpointReferenceType reference =
             EndpointReferenceUtils.getEndpointReference(
-                config.getClient().getDecoupledEndpoint());
+                getClient().getDecoupledEndpoint());
         if (reference != null) {
             String decoupledAddress = reference.getAddress().getValue();
             LOG.info("creating decoupled endpoint: " + decoupledAddress);
@@ -597,18 +595,17 @@
     }    
 
     private void initConfig() {
-        config = new ConfigBean();
         // Initialize some default values for the configuration
-        config.setClient(endpointInfo.getTraversedExtensor(new HTTPClientPolicy(), HTTPClientPolicy.class));
-        config.setAuthorization(endpointInfo.getTraversedExtensor(new AuthorizationPolicy(), 
-                                                                  AuthorizationPolicy.class));
-        config.setProxyAuthorization(endpointInfo.getTraversedExtensor(new AuthorizationPolicy(), 
-                                                                       AuthorizationPolicy.class));
+        client = endpointInfo.getTraversedExtensor(new HTTPClientPolicy(), HTTPClientPolicy.class);
+        authorization = endpointInfo.getTraversedExtensor(new AuthorizationPolicy(),
+                                                          AuthorizationPolicy.class);
+        proxyAuthorization = endpointInfo.getTraversedExtensor(new AuthorizationPolicy(),
+                                                               AuthorizationPolicy.class);
     }
 
     private Proxy getProxy() {
         Proxy proxy = null;
-        HTTPClientPolicy policy = config.getClient(); 
+        HTTPClientPolicy policy = getClient(); 
         if (policy.isSetProxyServer()) {
             proxy = new Proxy(Proxy.Type.valueOf(policy.getProxyServerType().toString()),
                               new InetSocketAddress(policy.getProxyServer(),
@@ -618,7 +615,7 @@
     }
 
     private void setPolicies(Message message, Map<String, List<String>> headers) {
-        AuthorizationPolicy authPolicy = config.getAuthorization();
+        AuthorizationPolicy authPolicy = getAuthorization();
         AuthorizationPolicy newPolicy = message.get(AuthorizationPolicy.class);
         String userName = (String)message.get(Message.USERNAME);
         String passwd = (String)message.get(Message.PASSWORD);
@@ -647,7 +644,7 @@
             headers.put("Authorization",
                         Arrays.asList(new String[] {type}));
         }
-        AuthorizationPolicy proxyAuthPolicy = config.getProxyAuthorization();
+        AuthorizationPolicy proxyAuthPolicy = getProxyAuthorization();
         if (proxyAuthPolicy.isSetUserName()) {
             userName = proxyAuthPolicy.getUserName();
             if (userName != null) {
@@ -670,7 +667,7 @@
                             Arrays.asList(new String[] {type}));
             }
         }
-        HTTPClientPolicy policy = config.getClient();
+        HTTPClientPolicy policy = getClient();
         if (policy.isSetCacheControl()) {
             headers.put("Cache-Control",
                         Arrays.asList(new String[] {policy.getCacheControl().value()}));
@@ -713,12 +710,44 @@
         }
     }
 
-    private class ConfigBean extends HTTPConduitConfigBean implements Configurable {
-        public String getBeanName() {
-            if (endpointInfo.getName() != null) {
-                return endpointInfo.getName().toString() + ".http-conduit";
-            }
-            return null;
-        }        
+    public String getBeanName() {
+        if (endpointInfo.getName() != null) {
+            return endpointInfo.getName().toString() + ".http-conduit";
+        }
+        return null;
+    }
+
+    public AuthorizationPolicy getAuthorization() {
+        return authorization;
+    }
+
+    public void setAuthorization(AuthorizationPolicy authorization) {
+        this.authorization = authorization;
     }
+
+    public HTTPClientPolicy getClient() {
+        return client;
+    }
+
+    public void setClient(HTTPClientPolicy client) {
+        this.client = client;
+    }
+
+    public AuthorizationPolicy getProxyAuthorization() {
+        return proxyAuthorization;
+    }
+
+    public void setProxyAuthorization(AuthorizationPolicy proxyAuthorization) {
+        this.proxyAuthorization = proxyAuthorization;
+    }
+
+    public SSLClientPolicy getSslClient() {
+        return sslClient;
+    }
+
+    public void setSslClient(SSLClientPolicy sslClient) {
+        this.sslClient = sslClient;
+    }  
+    
+    
 }

Modified: 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/HTTPTransportFactory.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- 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/HTTPTransportFactory.java Wed Jan 31 12:46:59 2007
@@ -115,14 +115,14 @@
     public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType target) throws IOException {
         HTTPConduit conduit = target == null
             ? new HTTPConduit(bus, endpointInfo) : new HTTPConduit(bus, endpointInfo, target);
-        configure(conduit.getConfig());
+        configure(conduit);
         conduit.retrieveConnectionFactory();
         return conduit;
     }
 
     public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
         JettyHTTPDestination destination = new JettyHTTPDestination(bus, this, endpointInfo);
-        configure(destination.getConfig());
+        configure(destination);
         destination.retrieveEngine();
         return destination;
     }

Modified: 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/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java Wed Jan 31 12:46:59 2007
@@ -43,7 +43,6 @@
 import org.apache.cxf.transport.AbstractDestination;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.http.destination.HTTPDestinationConfigBean;
 import org.apache.cxf.transports.http.QueryHandler;
 import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -101,18 +100,10 @@
                  : JettyHTTPServerEngine.getForPort(bus,
                                                     nurl.getProtocol(),
                                                     nurl.getPort(),
-                                                    config.getSslServer());
+                                                    getSslServer());
     }
     
     /**
-     * @return the encapsulated config bean
-     */
-    protected HTTPDestinationConfigBean getConfig() {
-        return config;
-    }
-
-    
-    /**
      * Activate receipt of incoming messages.
      */
     protected void activate() {
@@ -228,8 +219,8 @@
     }
 
     protected void doService(HttpRequest req, HttpResponse resp) throws IOException {
-        if (config.getServer().isSetRedirectURL()) {
-            resp.sendRedirect(config.getServer().getRedirectURL());
+        if (getServer().isSetRedirectURL()) {
+            resp.sendRedirect(getServer().getRedirectURL());
             resp.commit();
             req.setHandled(true);
             return;
@@ -273,7 +264,7 @@
             if (!StringUtils.isEmpty(getAddressValue(endpointInfo))) {
                 inMessage.put(Message.BASE_PATH, new URL(getAddressValue(endpointInfo)).getPath());
             }
-            inMessage.put(Message.FIXED_PARAMETER_ORDER, config.isFixedParameterOrder());
+            inMessage.put(Message.FIXED_PARAMETER_ORDER, isFixedParameterOrder());
             inMessage.put(Message.ASYNC_POST_RESPONSE_DISPATCH, Boolean.TRUE); 
             
             setHeaders(inMessage);

Added: 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=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,53 @@
+/**
+ * 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.spring;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+
+public class HttpConduitBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+    private static final String HTTP_NS = "http://cxf.apache.org/transports/http/configuration";
+
+    @Override
+    protected 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"), 
+                                 "proxyAuthorization");
+        mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization");
+        mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "sslClient"), "sslClient");
+    }
+    
+    @Override
+    protected String getJaxbPackage() {
+        return "org.apache.cxf.transports.http.configuration";
+    }
+
+    @Override
+    protected Class getBeanClass(Element arg0) {
+        return HTTPConduit.class;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,55 @@
+/**
+ * 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.spring;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+
+public class HttpDestinationBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+    private static final String HTTP_NS = "http://cxf.apache.org/transports/http/configuration";
+
+    @Override
+    protected 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");
+        mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "authorization"), "authorization");
+        mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "fixedParameterOrder"),
+                                 "fixedParameterOrder");
+        mapElementToJaxbProperty(element, bean, new QName(HTTP_NS, "contextMatchStrategy"),
+                                 "contextMatchStrategy");
+    }
+    
+    @Override
+    protected String getJaxbPackage() {
+        return "org.apache.cxf.transports.http.configuration";
+    }
+
+    @Override
+    protected Class getBeanClass(Element arg0) {
+        return AbstractHTTPDestination.class;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpDestinationBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,28 @@
+/**
+ * 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.spring;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+public class NamespaceHandler extends NamespaceHandlerSupport {
+    public void init() {
+        registerBeanDefinitionParser("conduit", new HttpConduitBeanDefinitionParser());        
+        registerBeanDefinitionParser("destination", new HttpDestinationBeanDefinitionParser());        
+    }
+}

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/NamespaceHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers Wed Jan 31 12:46:59 2007
@@ -0,0 +1 @@
+http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas Wed Jan 31 12:46:59 2007
@@ -0,0 +1,3 @@
+http\://cxf.apache.org/schema/transports/http.xsd=schemas/wsdl/http-conf.xsd
+http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd=schemas/configuration/security.xsd
+http\://cxf.apache.org/../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd=schemas/wsdl/wsdl.xsd
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
    svn:executable = *

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=501982&r1=501981&r2=501982
==============================================================================
--- 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 Wed Jan 31 12:46:59 2007
@@ -22,13 +22,50 @@
            xmlns:xs="http://www.w3.org/2001/XMLSchema" 
            xmlns:http-conf="http://cxf.apache.org/transports/http/configuration" 
            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+           xmlns:sec="http://cxf.apache.org/configuration/security"
            elementFormDefault="qualified" 
            attributeFormDefault="unqualified"
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
            jaxb:version="2.0">
 
     <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+    <xs:import namespace="http://cxf.apache.org/configuration/security" schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd"/>
 
+    <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="contextMatchStrategy" type="xs:string" default="stem"/>
+    <xs:element name="fixedParameterOrder" type="xs:boolean" default="false"/>
+
+    <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
+    <xs:element name="proxyAuthorization" type="sec:AuthorizationPolicy"/>
+    <xs:element name="sslClient" type="sec:SSLClientPolicy"/>
+
+    <xs:element name="conduit">
+        <xs:complexType>
+            <xs:sequence>
+                <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:sequence>
+            <xs:attribute name="id" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    
+    <xs:element name="destination">
+      <xs:complexType>        
+        <xs:sequence>
+            <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:contextMatchStrategy" minOccurs="0"/>
+            <xs:element ref="http-conf:fixedParameterOrder" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string" use="required"/>
+      </xs:complexType>
+   </xs:element>
+   
     <xs:complexType name="HTTPServerPolicy">
         <xs:annotation>
             <xs:documentation>HTTP Server configuration properties.
@@ -136,8 +173,6 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:element name="server" type="http-conf:HTTPServerPolicy"/>
-
 
     <xs:complexType name="HTTPClientPolicy">
         <xs:annotation>
@@ -332,7 +367,6 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:element name="client" type="http-conf:HTTPClientPolicy"/>
     
     <xs:complexType name="HTTPListenerPolicy">
     	<xs:sequence>

Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java Wed Jan 31 12:46:59 2007
@@ -43,7 +43,6 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.http.conduit.HTTPConduitConfigBean;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.easymock.classextension.EasyMock;
@@ -219,14 +218,13 @@
                                               decoupledEngine);
         conduit.retrieveConnectionFactory();
 
-        HTTPConduitConfigBean config = conduit.getConfig();
         if (send) {
-            config.getClient().setConnectionTimeout(303030);
-            config.getClient().setReceiveTimeout(404040);
+            conduit.getClient().setConnectionTimeout(303030);
+            conduit.getClient().setReceiveTimeout(404040);
             if (httpConnection) {
-                config.getClient().setAutoRedirect(autoRedirect);
+                conduit.getClient().setAutoRedirect(autoRedirect);
                 if (!autoRedirect) {
-                    config.getClient().setAllowChunking(true);
+                    conduit.getClient().setAllowChunking(true);
                 } 
             }
         }
@@ -235,7 +233,7 @@
             URL decoupledURL = null;
             if (decoupled) {
                 decoupledURL = new URL(NOWHERE + "response");
-                config.getClient().setDecoupledEndpoint(decoupledURL.toString());
+                conduit.getClient().setDecoupledEndpoint(decoupledURL.toString());
             } 
         }
        

Modified: 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/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java Wed Jan 31 12:46:59 2007
@@ -279,7 +279,7 @@
                                                              conduitInitiator,
                                                              endpointInfo,
                                                              engine);
-        assertEquals(customPolicy, dest.getConfig().getServer());
+        assertEquals(customPolicy, dest.getServer());
     }
         
     private JettyHTTPDestination setUpDestination()
@@ -311,7 +311,7 @@
                                                              endpointInfo,
                                                              engine);
         dest.retrieveEngine();
-        policy = dest.getConfig().getServer();
+        policy = dest.getServer();
         observer = new MessageObserver() {
             public void onMessage(Message m) {
                 inMessage = m;

Added: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java (added)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,65 @@
+/**
+ * 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.spring;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+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.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class ApplicationContextTest extends TestCase {
+    public void testContext() throws Exception {
+        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
+            new String[] {"META-INF/cxf/cxf.xml", "META-INF/cxf/cxf-extension-http.xml",
+                          "/org/apache/cxf/transport/http/spring/beans.xml", });
+        
+        ConfigurerImpl cfg = new ConfigurerImpl(ctx);
+        
+        EndpointInfo info = new EndpointInfo();
+        info.setName(new QName("urn:test:ns", "Foo"));
+        info.setAddress("http://localhost:9000");
+        
+        Bus bus = (Bus) ctx.getBean("cxf");
+        bus.setExtension(cfg, Configurer.class);
+        
+        DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
+        Destination d = 
+            dfm.getDestinationFactory("http://schemas.xmlsoap.org/soap/http").getDestination(info);
+        assertTrue(d instanceof JettyHTTPDestination);
+        JettyHTTPDestination jd = (JettyHTTPDestination) d;
+        assertEquals("foobar", jd.getServer().getContentEncoding());
+        
+        ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class);
+        ConduitInitiator ci = cim.getConduitInitiator("http://schemas.xmlsoap.org/soap/http");
+        HTTPConduit conduit = (HTTPConduit) ci.getConduit(info);
+        assertEquals(97, conduit.getClient().getConnectionTimeout());
+        
+    }
+}

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java (added)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java Wed Jan 31 12:46:59 2007
@@ -0,0 +1,58 @@
+/**
+ * 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.spring;
+
+import org.w3c.dom.Document;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+
+public class BeanDefinitionParsersTest extends TestCase {
+    public void testDest()throws Exception {
+        BeanDefinitionBuilder bd = BeanDefinitionBuilder.childBeanDefinition("child");
+        
+        HttpDestinationBeanDefinitionParser parser = new HttpDestinationBeanDefinitionParser();
+
+        Document d = DOMUtils.readXml(getClass().getResourceAsStream("destination.xml"));
+        parser.doParse(d.getDocumentElement(), bd);
+        
+        PropertyValue[] pvs = bd.getRawBeanDefinition().getPropertyValues().getPropertyValues();
+        assertEquals(2, pvs.length);
+        assertEquals("foobar", ((HTTPServerPolicy) pvs[0].getValue()).getContentEncoding());
+        assertEquals("exact", pvs[1].getValue());
+    }
+    
+    public void testConduit()throws Exception {
+        BeanDefinitionBuilder bd = BeanDefinitionBuilder.childBeanDefinition("child");
+        
+        HttpConduitBeanDefinitionParser parser = new HttpConduitBeanDefinitionParser();
+
+        Document d = DOMUtils.readXml(getClass().getResourceAsStream("conduit.xml"));
+        parser.doParse(d.getDocumentElement(), bd);
+        
+        PropertyValue[] pvs = bd.getRawBeanDefinition().getPropertyValues().getPropertyValues();
+        assertEquals(1, pvs.length);
+        assertEquals(97, ((HTTPClientPolicy) pvs[0].getValue()).getConnectionTimeout());
+    }
+}

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/BeanDefinitionParsersTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml?view=auto&rev=501982
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml (added)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml Wed Jan 31 12:46:59 2007
@@ -0,0 +1,35 @@
+<?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:beans="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:h="http://cxf.apache.org/transports/http/configuration"
+       xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  
+    <h:destination id="{urn:test:ns}Foo.http-destination">
+      <h:server ContentEncoding="foobar"/>
+    </h:destination>
+    
+    <h:conduit id="{urn:test:ns}Foo.http-conduit">
+      <h:client ConnectionTimeout="97"/>
+    </h:conduit>
+</beans>

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/cxf.xml Wed Jan 31 12:46:59 2007
@@ -19,17 +19,14 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
   
-    <bean name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
-
+    <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
+    </http:conduit>
+    
     <import resource="wsa_interceptors.xml"/>
 </beans>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/concurrent.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/concurrent.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/concurrent.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/concurrent.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9992/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9992/decoupled_endpoint"/>
+    </http:conduit>
     
     <import resource="rminterceptors.xml"/>  
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
     <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/decoupled_bare.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
     <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/nonanonymous-deferred.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/nonanonymous-deferred.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/nonanonymous-deferred.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/nonanonymous-deferred.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9999/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>  

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-deferred.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-deferred.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-deferred.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-deferred.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9997/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9997/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>  

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-message-loss.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-message-loss.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-message-loss.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-message-loss.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9993/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9993/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer-test.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer-test.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer-test.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer-test.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9994/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9994/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>  

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-no-offer.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9995/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>  

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-seqlength2.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-seqlength2.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-seqlength2.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway-seqlength2.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9996/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9996/decoupled_endpoint"/>
+    </http:conduit>
     
     <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager">
         <property name="bus" ref="cxf"/>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway.xml?view=diff&rev=501982&r1=501981&r2=501982
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/twoway.xml Wed Jan 31 12:46:59 2007
@@ -21,17 +21,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:wsrm-mgmt="http://cxf.apache.org/ws/rm/manager"
        xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
-       xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
        xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    
-    <bean name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit" abstract="true">
-        <property name="client">
-            <value>
-                <http-conf:client DecoupledEndpoint="http://localhost:9998/decoupled_endpoint"/>
-            </value>
-        </property>
-    </bean>
+  
+    <http:conduit id="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9998/decoupled_endpoint"/>
+    </http:conduit>
     
     <import resource="rminterceptors.xml"/>  
 



Mime
View raw message