cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r504961 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/configuration/spring/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/core/src/main/java/org/apache/cxf/wsdl11/ rt/transports/jms/ rt/transports/jm...
Date Thu, 08 Feb 2007 16:55:53 GMT
Author: dandiep
Date: Thu Feb  8 08:55:52 2007
New Revision: 504961

URL: http://svn.apache.org/viewvc?view=rev&rev=504961
Log:
o Simplify JMS Configuration greatly.
o Bring things down to one namespace so people don't need to switch all the 
  time.
o Add Spring 2.0 handlers to get rid of ugly bean Syntax
o Remove old JAXB property editors
o Renamed "server" property to "runtimePolicy" to more clearly reflect what it
  is for.
o Make all the configuration objects available via getters and setters so that
  people using the API can access them easily.
o Fix infinite loop in WSDLServiceBuilder
o Remove unncessary @Resource annotation from SoapBindingFactory
o This will require documentation and possibly sample updates.

Added:
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransport.java   (with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java   (with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java   (with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/NamespaceHandler.java   (with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers   (with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas   (with props)
Removed:
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-property-editors.xml
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/configuration/
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms-conf.xsd
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms-context.xjb
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms-context.xsd
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    incubator/cxf/trunk/rt/transports/jms/pom.xml
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml

Modified: 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=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Thu Feb  8 08:55:52 2007
@@ -34,8 +34,18 @@
 
 public abstract class AbstractBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
     
-    protected void mapElementToJaxbProperty(Element parent, BeanDefinitionBuilder bean, QName name,
+    protected void mapElementToJaxbProperty(Element parent, 
+                                            BeanDefinitionBuilder bean, 
+                                            QName name,
                                             String string) {
+        mapElementToJaxbProperty(parent, bean, name, string, null);
+    }
+    
+    protected void mapElementToJaxbProperty(Element parent, 
+                                            BeanDefinitionBuilder bean, 
+                                            QName name,
+                                            String string,
+                                            Class<?> c) {
         Node data = null;
         NodeList nl = parent.getChildNodes();
         for (int i = 0; i < nl.getLength(); i++) {
@@ -57,7 +67,12 @@
             context = JAXBContext.newInstance(getJaxbPackage(), 
                                               getClass().getClassLoader());
             Unmarshaller u = context.createUnmarshaller();
-            obj = u.unmarshal(data);
+            if (c != null) {
+                obj = u.unmarshal(data, c);
+            } else {
+                obj = u.unmarshal(data);
+            }
+            
             if (obj instanceof JAXBElement<?>) {
                 JAXBElement<?> el = (JAXBElement<?>)obj;
                 obj = el.getValue();

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Thu Feb  8 08:55:52 2007
@@ -278,7 +278,6 @@
         bmsg.addExtensor(bodyInfo);
     }
     
-    @Resource(name = "mtomEnabled")
     public void setMtomEnabled(boolean mtomEnabled) {
         this.mtomEnabled = mtomEnabled;
     }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Thu Feb  8 08:55:52 2007
@@ -268,6 +268,16 @@
 
     @SuppressWarnings("unchecked")
     private void addSchema(Schema schema) {
+        if (schemaList.get(schema.getDocumentBaseURI()) == null) {
+            schemaList.put(schema.getDocumentBaseURI(), schema.getElement());
+        } else {
+            String tns = schema.getDocumentBaseURI() + "#"
+                         + schema.getElement().getAttribute("targetNamespace");
+            if (schemaList.get(tns) == null) {
+                schemaList.put(tns, schema.getElement());
+            }
+        }
+        
         Map<String, List> imports = schema.getImports();
         if (imports != null && imports.size() > 0) {
             Collection<String> importKeys = imports.keySet();
@@ -276,20 +286,11 @@
                     List<SchemaImport> schemaImports = imports.get(importNamespace);
                     for (SchemaImport schemaImport : schemaImports) {
                         Schema tempImport = schemaImport.getReferencedSchema();
-                        if (tempImport != null) {
+                        if (tempImport != null && !schemaList.containsValue(tempImport.getElement())) {
                             addSchema(tempImport);
                         }
                     }
                 }
-            }
-        }
-        if (schemaList.get(schema.getDocumentBaseURI()) == null) {
-            schemaList.put(schema.getDocumentBaseURI(), schema.getElement());
-        } else {
-            String tns = schema.getDocumentBaseURI() + "#"
-                         + schema.getElement().getAttribute("targetNamespace");
-            if (schemaList.get(tns) == null) {
-                schemaList.put(tns, schema.getElement());
             }
         }
     }

Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Thu Feb  8 08:55:52 2007
@@ -126,46 +126,6 @@
                                         <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
                                     </deleteDirs>
                                 </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-conf.xsd</xsd>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/wsdl/jms-context.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms-context.xjb</bindingFile>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/jms-conduit.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>
-                                    </extensionArgs>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/jms-destination.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>
-                                    </extensionArgs>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
-                                <xsdOption>
-                                    <xsd>${basedir}/src/main/resources/schemas/configuration/jms-transport-base.xsd</xsd>
-                                    <bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
-                                    <extension>true</extension>
-                                    <extensionArgs>
-                                        <extensionArg>-Xdv</extensionArg>
-                                    </extensionArgs>
-                                    <deleteDirs>
-                                        <deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
-                                    </deleteDirs>
-                                </xsdOption>
                             </xsdOptions>
                         </configuration>
                         <goals>

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Thu Feb  8 08:55:52 2007
@@ -49,20 +49,19 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.jms.conduit.JMSConduitConfigBean;
-import org.apache.cxf.transports.jms.JMSClientBehaviorPolicyType;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.jms_conf.JMSClientConfig;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
-public class JMSConduit extends AbstractConduit {
+public class JMSConduit extends AbstractConduit implements Configurable, JMSTransport {
 
     protected static final String BASE_BEAN_NAME_SUFFIX = ".jms-conduit-base";
 
     private static final Logger LOG = LogUtils.getL7dLogger(JMSConduit.class);
     
     protected final JMSTransportBase base;
-    protected JMSConduitConfigBean config;
+    protected ClientConfig clientConfig;
+    protected ClientBehaviorPolicyType runtimePolicy;
+    protected AddressType address;
+    protected SessionPoolType sessionPool;
        
     public JMSConduit(Bus b, EndpointInfo endpointInfo) {
         this(b, endpointInfo, null);
@@ -73,7 +72,7 @@
                       EndpointReferenceType target) {           
         super(target);        
 
-        base = new JMSTransportBase(b, endpointInfo, false, BASE_BEAN_NAME_SUFFIX);
+        base = new JMSTransportBase(b, endpointInfo, false, BASE_BEAN_NAME_SUFFIX, this);
         
         initConfig();
     } 
@@ -84,7 +83,7 @@
 
         try {
             if (null == base.sessionFactory) {
-                JMSProviderHub.connect(base, null);
+                JMSProviderHub.connect(this);
             }
         } catch (JMSException jmsex) {
             getLogger().log(Level.WARNING, "JMS connect failed with JMSException : ", jmsex);            
@@ -145,7 +144,7 @@
         
         Object result = null;
         
-        long timeout = config.getClientConfig().getClientReceiveTimeout();
+        long timeout = getClientConfig().getClientReceiveTimeout();
 
         Long receiveTimeout = (Long)outMessage.get(JMSConstants.JMS_CLIENT_RECEIVE_TIMEOUT);
 
@@ -172,36 +171,70 @@
         }
     }
 
+    public void connected(javax.jms.Destination target, 
+                          javax.jms.Destination reply, 
+                          JMSSessionFactory factory) {
+        base.connected(target, reply, factory);
+    }
+
+    public String getBeanName() {
+        return base.endpointInfo.getName().toString() + ".jms-conduit";
+    }
+    
     private void initConfig() {
 
-        final class JMSConduitConfiguration extends JMSConduitConfigBean implements Configurable {
-            public String getBeanName() {
-                return base.endpointInfo.getName().toString() + ".jms-conduit";
-            }
-        }
-        
-        // It'd be really nice if we did this in a way that was more friendly to the API
-        JMSConduitConfigBean bean = new JMSConduitConfiguration();
-        
-        bean.setClient(base.endpointInfo.getTraversedExtensor(new JMSClientBehaviorPolicyType(),
-                                                              JMSClientBehaviorPolicyType.class));
-        bean.setClientConfig(base.endpointInfo.getTraversedExtensor(new JMSClientConfig(),
-                                                                    JMSClientConfig.class));
+        this.address = base.endpointInfo.getTraversedExtensor(new AddressType(), 
+                                                              AddressType.class);
+        this.sessionPool = base.endpointInfo.getTraversedExtensor(new SessionPoolType(), 
+                                                                  SessionPoolType.class);
+        this.clientConfig = base.endpointInfo.getTraversedExtensor(new ClientConfig(),
+                                                                   ClientConfig.class);
+        this.runtimePolicy = base.endpointInfo.getTraversedExtensor(new ClientBehaviorPolicyType(),
+                                                                    ClientBehaviorPolicyType.class);
 
         Configurer configurer = base.bus.getExtension(Configurer.class);
         if (null != configurer) {
-            configurer.configureBean(bean);
-            configurer.configureBean(base);
+            configurer.configureBean(this);
         }
-        
-        config = bean;
-
     }
 
     private boolean isTextPayload() {
         return JMSConstants.TEXT_MESSAGE_TYPE.equals(
-            config.getClient().getMessageType().value());
+            getRuntimePolicy().getMessageType().value());
+    }
+    
+    public AddressType getJMSAddress() {
+        return address;
+    }
+
+    public void setJMSAddress(AddressType a) {
+        this.address = a;
     }
+
+    public ClientConfig getClientConfig() {
+        return clientConfig;
+    }
+
+    public void setClientConfig(ClientConfig clientConfig) {
+        this.clientConfig = clientConfig;
+    }
+
+    public ClientBehaviorPolicyType getRuntimePolicy() {
+        return runtimePolicy;
+    }
+
+    public void setRuntimePolicy(ClientBehaviorPolicyType runtimePolicy) {
+        this.runtimePolicy = runtimePolicy;
+    }
+
+    public SessionPoolType getSessionPool() {
+        return sessionPool;
+    }
+
+    public void setSessionPool(SessionPoolType sessionPool) {
+        this.sessionPool = sessionPool;
+    }
+
     
     private class JMSOutputStream extends AbstractCachedOutputStream {
         private Message outMessage;
@@ -254,12 +287,12 @@
             //We don't want to send temp queue in
             //replyTo header for oneway calls
             if (isOneWay
-                && (base.getAddressPolicy().getJndiReplyDestinationName() == null)) {
+                && (getJMSAddress().getJndiReplyDestinationName() == null)) {
                 replyTo = null;
             }
 
             jmsMessage = base.marshal(request, pooledSession.session(), replyTo,
-                config.getClient().getMessageType().value());
+                getRuntimePolicy().getMessageType().value());
             
             JMSMessageHeadersType headers =
                 (JMSMessageHeadersType)outMessage.get(JMSConstants.JMS_CLIENT_REQUEST_HEADERS);
@@ -269,7 +302,7 @@
             String correlationID = base.getCorrelationId(headers);
             long ttl = base.getTimeToLive(headers);
             if (ttl <= 0) {
-                ttl = config.getClientConfig().getMessageTimeToLive();
+                ttl = getClientConfig().getMessageTimeToLive();
             }
             
             base.setMessageProperties(headers, jmsMessage);           

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Thu Feb  8 08:55:52 2007
@@ -53,25 +53,26 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transport.jms.destination.JMSDestinationConfigBean;
-import org.apache.cxf.transports.jms.JMSServerBehaviorPolicyType;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.jms_conf.JMSServerConfig;
 import org.apache.cxf.workqueue.WorkQueueManager;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 
 
-public class JMSDestination extends AbstractDestination {
+public class JMSDestination extends AbstractDestination implements Configurable, JMSTransport {
         
     protected static final String BASE_BEAN_NAME_SUFFIX = ".jms-destination-base";
 
     private static final Logger LOG = LogUtils.getL7dLogger(JMSDestination.class);
-
+    
+    protected ServerConfig serverConfig;
+    protected ServerBehaviorPolicyType runtimePolicy;
+    protected AddressType address;
+    protected SessionPoolType sessionPool;
+     
     final ConduitInitiator conduitInitiator;
     final JMSTransportBase base;
-    JMSDestinationConfigBean config;
+  
     PooledSession listenerSession;
     JMSListenerThread listenerThread;
     
@@ -80,7 +81,7 @@
                           EndpointInfo info) throws IOException {
         super(getTargetReference(info.getAddress()), info);    
         
-        base = new JMSTransportBase(b, endpointInfo, true, BASE_BEAN_NAME_SUFFIX);
+        base = new JMSTransportBase(b, endpointInfo, true, BASE_BEAN_NAME_SUFFIX, this);
 
         conduitInitiator = ci;
 
@@ -105,7 +106,7 @@
 
         try {
             getLogger().log(Level.FINE, "establishing JMS connection");
-            JMSProviderHub.connect(base, config);
+            JMSProviderHub.connect(this, serverConfig, runtimePolicy);
             //Get a non-pooled session. 
             listenerSession = base.sessionFactory.get(base.targetDestination);
             listenerThread = new JMSListenerThread(listenerSession);
@@ -159,7 +160,7 @@
         
         if (correlationID == null
             || "".equals(correlationID)
-            && config.getServer().isUseMessageIDAsCorrelationID()) {
+            && getRuntimePolicy().isUseMessageIDAsCorrelationID()) {
             correlationID = request.getJMSMessageID();
         }
     
@@ -204,29 +205,61 @@
         } 
     }
     
-    private void initConfig() {
-        
-        final class JMSDestinationConfiguration extends JMSDestinationConfigBean implements Configurable {
-
-            public String getBeanName() {
-                return endpointInfo.getName().toString() + ".jms-destination";
-            }
-        }
-        
-        JMSDestinationConfigBean bean = new JMSDestinationConfiguration();
+    public void connected(javax.jms.Destination target, 
+                          javax.jms.Destination reply, 
+                          JMSSessionFactory factory) {
+        base.connected(target, reply, factory);
+    }
 
-        bean.setServer(endpointInfo.getTraversedExtensor(new JMSServerBehaviorPolicyType(), 
-                                                         JMSServerBehaviorPolicyType.class));
-        bean.setServerConfig(endpointInfo.getTraversedExtensor(new JMSServerConfig(), JMSServerConfig.class));
+    public String getBeanName() {
+        return endpointInfo.getName().toString() + ".jms-destination";
+    }
+    
+    private void initConfig() {
+        this.runtimePolicy = endpointInfo.getTraversedExtensor(new ServerBehaviorPolicyType(),
+                                                               ServerBehaviorPolicyType.class);
+        this.serverConfig = endpointInfo.getTraversedExtensor(new ServerConfig(), ServerConfig.class);
+        this.address = endpointInfo.getTraversedExtensor(new AddressType(), AddressType.class);
+        this.sessionPool = endpointInfo.getTraversedExtensor(new SessionPoolType(), SessionPoolType.class);
         
         Configurer configurer = base.bus.getExtension(Configurer.class);
         if (null != configurer) {
-            configurer.configureBean(bean);
+            configurer.configureBean(this);
         }
-        
-        config = bean;
     }
-   
+
+    public AddressType getJMSAddress() {
+        return address;
+    }
+
+    public void setJMSAddress(AddressType a) {
+        this.address = a;
+    }
+
+    public ServerBehaviorPolicyType getRuntimePolicy() {
+        return runtimePolicy;
+    }
+
+    public void setRuntimePolicy(ServerBehaviorPolicyType runtimePolicy) {
+        this.runtimePolicy = runtimePolicy;
+    }
+
+    public ServerConfig getServerConfig() {
+        return serverConfig;
+    }
+
+    public void setServerConfig(ServerConfig serverConfig) {
+        this.serverConfig = serverConfig;
+    }
+
+    public SessionPoolType getSessionPool() {
+        return sessionPool;
+    }
+
+    public void setSessionPool(SessionPoolType sessionPool) {
+        this.sessionPool = sessionPool;
+    }
+    
     protected class JMSListenerThread extends Thread {
         private final PooledSession listenSession;
 
@@ -441,7 +474,7 @@
             long ttl = base.getTimeToLive(headers);
             
             if (ttl <= 0) {
-                ttl = config.getServerConfig().getMessageTimeToLive();
+                ttl = getServerConfig().getMessageTimeToLive();
             }
             
             long timeToLive = 0;

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSProviderHub.java Thu Feb  8 08:55:52 2007
@@ -27,10 +27,6 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.cxf.transport.jms.destination.JMSDestinationConfigBean;
-import org.apache.cxf.transports.jms.JMSAddressPolicyType;
-
-
 
 /**
  * This class acts as the hub of JMS provider usage, creating shared
@@ -60,12 +56,16 @@
         return "JMSProviderHub";
     }
 
-  
-    protected static void connect(JMSTransportBase jmsTransport,
-                                  JMSDestinationConfigBean jmsDestConfigBean)
+    protected static void connect(JMSTransport jmsTransport) throws JMSException, NamingException {
+        connect(jmsTransport, null, null);
+    }
+    
+    protected static void connect(JMSTransport jmsTransport, 
+                                  ServerConfig jmsDestConfigBean,
+                                  ServerBehaviorPolicyType runtimePolicy)
         throws JMSException, NamingException {
 
-        JMSAddressPolicyType  addrDetails = jmsTransport.getAddressPolicy();
+        AddressType  addrDetails = jmsTransport.getJMSAddress();
       
         // get JMS connection resources and destination
         //
@@ -93,7 +93,7 @@
         }
         
         if (null != jmsDestConfigBean) {
-            String clientID = jmsDestConfigBean.getServerConfig().getDurableSubscriptionClientId();
+            String clientID = jmsDestConfigBean.getDurableSubscriptionClientId();
             
             if  (clientID != null) {
                 connection.setClientID(clientID);
@@ -116,7 +116,7 @@
                                   replyDestination,
                                   context,
                                   jmsTransport,
-                                  jmsDestConfigBean);
+                                  runtimePolicy);
 
         // notify transport that connection is complete        
         jmsTransport.connected(requestDestination, replyDestination, sf);

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSSessionFactory.java Thu Feb  8 08:55:52 2007
@@ -42,10 +42,6 @@
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.AbstractTwoStageCache;
-import org.apache.cxf.transport.jms.base.JMSTransportBaseConfigBean;
-import org.apache.cxf.transport.jms.destination.JMSDestinationConfigBean;
-import org.apache.cxf.transports.jms.jms_conf.JMSSessionPoolConfigPolicy;
-
 
 /**
  * This class encapsulates the creation and pooling logic for JMS Sessions.
@@ -115,8 +111,8 @@
     private AbstractTwoStageCache<PooledSession> replyCapableSessionCache;
     private AbstractTwoStageCache<PooledSession> sendOnlySessionCache;
     private final Destination theReplyDestination;
-    private final JMSTransportBaseConfigBean jmsBaseConfigBean;
-    private final JMSDestinationConfigBean jmsDestConfigBean;
+    private final JMSTransport jmsTransport;
+    private final ServerBehaviorPolicyType runtimePolicy;
  
     /**
      * Constructor.
@@ -126,15 +122,15 @@
     public JMSSessionFactory(Connection connection, 
                              Destination replyDestination,
                              Context context,
-                             JMSTransportBaseConfigBean tbb,
-                             JMSDestinationConfigBean db) {
+                             JMSTransport tbb,
+                             ServerBehaviorPolicyType runtimePolicy) {
         theConnection = connection;
         theReplyDestination = replyDestination;
         initialContext = context;
-        jmsBaseConfigBean = tbb;
-        jmsDestConfigBean = db;
+        jmsTransport = tbb;
+        this.runtimePolicy = runtimePolicy;
         
-        JMSSessionPoolConfigPolicy sessionPoolConfig = jmsBaseConfigBean.getSessionPoolConfig();
+        SessionPoolType sessionPoolConfig = jmsTransport.getSessionPool();
         
         lowWaterMark = sessionPoolConfig.getLowWaterMark();
         highWaterMark = sessionPoolConfig.getHighWaterMark();
@@ -448,7 +444,7 @@
         
         return new PooledSession(session, destination, session.createSender(null),
                                  session.createReceiver((Queue)destination, 
-                                 jmsDestConfigBean.getServer().getMessageSelector()));
+                                                        runtimePolicy.getMessageSelector()));
     }
 
 
@@ -467,8 +463,8 @@
                                                                                    Session.AUTO_ACKNOWLEDGE);
         TopicSubscriber sub = null;
         if (consumer) {
-            String messageSelector =  jmsDestConfigBean.getServer().getMessageSelector();
-            String durableName = jmsDestConfigBean.getServer().getDurableSubscriberName();
+            String messageSelector = runtimePolicy.getMessageSelector();
+            String durableName = runtimePolicy.getDurableSubscriberName();
             if (durableName != null) {
                 sub = session.createDurableSubscriber((Topic)destination,
                                                       durableName,
@@ -505,6 +501,6 @@
 
     private boolean isDestinationStyleQueue() {
         return JMSConstants.JMS_QUEUE.equals(
-            jmsBaseConfigBean.getAddressPolicy().getDestinationStyle().value());
+            jmsTransport.getJMSAddress().getDestinationStyle().value());
     }
 }

Added: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransport.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransport.java?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransport.java (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransport.java Thu Feb  8 08:55:52 2007
@@ -0,0 +1,42 @@
+/**
+ * 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.jms;
+
+import javax.jms.Destination;
+
+/**
+ * Common accessors between the conduit and destination which are needed for common code.
+ *
+ */
+public interface JMSTransport {
+
+    AddressType getJMSAddress();
+
+    SessionPoolType getSessionPool();
+
+    /**
+     * Callback from the JMSProviderHub indicating the ClientTransport has
+     * been sucessfully connected.
+     *
+     * @param targetDestination the target destination
+     * @param sessionFactory used to get access to a pooled JMS resources
+     */
+    void connected(Destination target, Destination reply, JMSSessionFactory factory);
+}

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

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

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

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportBase.java Thu Feb  8 08:55:52 2007
@@ -29,19 +29,11 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-
 import org.apache.cxf.Bus;
-import org.apache.cxf.configuration.Configurable;
-import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.jms.base.JMSTransportBaseConfigBean;
-import org.apache.cxf.transports.jms.JMSAddressPolicyType;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.context.JMSPropertyType;
-import org.apache.cxf.transports.jms.jms_conf.JMSSessionPoolConfigPolicy;
 
 
-public class JMSTransportBase extends JMSTransportBaseConfigBean implements Configurable {    
+public class JMSTransportBase {    
     
     protected Destination targetDestination;
     protected Destination replyDestination;
@@ -50,30 +42,20 @@
     //protected EndpointReferenceType targetEndpoint;
     protected EndpointInfo endpointInfo;
     protected String beanNameSuffix;
-    
+    private JMSTransport transport;
     
     //--Constructors------------------------------------------------------------
-    public JMSTransportBase(Bus b, EndpointInfo endpoint, boolean isServer, String suffix) {
+    public JMSTransportBase(Bus b, 
+                            EndpointInfo endpoint, 
+                            boolean isServer, 
+                            String suffix,
+                            JMSTransport transport) {
         bus = b;
         endpointInfo = endpoint;
         beanNameSuffix = suffix;
-
-        setAddressPolicy(endpointInfo.getTraversedExtensor(new JMSAddressPolicyType(), 
-                                                           JMSAddressPolicyType.class));
-        setSessionPoolConfig(endpointInfo.getTraversedExtensor(new JMSSessionPoolConfigPolicy(), 
-                                                               JMSSessionPoolConfigPolicy.class));
- 
-        Configurer configurer = bus.getExtension(Configurer.class);
-        if (null != configurer) {
-            configurer.configureBean(this);
-        }
+        this.transport = transport;
     }
     
-    public String getBeanName() {
-        return endpointInfo.getName().toString() + beanNameSuffix;
-    }
-
-
     /**
      * Callback from the JMSProviderHub indicating the ClientTransport has
      * been sucessfully connected.
@@ -217,15 +199,14 @@
     }
     
     protected String getAddrUriFromJMSAddrPolicy() {
-        JMSAddressPolicyType jmsAddressPolicy = getAddressPolicy();
-        return "jms:" 
-                        + jmsAddressPolicy.getJndiConnectionFactoryName() 
+        AddressType jmsAddressPolicy = transport.getJMSAddress();
+        return "jms:" + jmsAddressPolicy.getJndiConnectionFactoryName() 
                         + "#"
                         + jmsAddressPolicy.getJndiDestinationName();
     }
     
     protected String getReplyTotAddrUriFromJMSAddrPolicy() {
-        JMSAddressPolicyType jmsAddressPolicy = getAddressPolicy();
+        AddressType jmsAddressPolicy = transport.getJMSAddress();
         return "jms:" 
                         + jmsAddressPolicy.getJndiConnectionFactoryName() 
                         + "#"
@@ -234,6 +215,6 @@
 
     protected boolean isDestinationStyleQueue() {
         return JMSConstants.JMS_QUEUE.equals(
-            getAddressPolicy().getDestinationStyle().value());
+            transport.getJMSAddress().getDestinationStyle().value());
     }
 }

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java Thu Feb  8 08:55:52 2007
@@ -33,11 +33,6 @@
 import javax.naming.NamingException;
 
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.transports.jms.JMSAddressPolicyType;
-import org.apache.cxf.transports.jms.JMSNamingPropertyType;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.context.JMSPropertyType;
-
 
 public final class JMSUtils {
 
@@ -47,7 +42,7 @@
 
     }
 
-    public static Context getInitialContext(JMSAddressPolicyType addrType) throws NamingException {
+    public static Context getInitialContext(AddressType addrType) throws NamingException {
         Properties env = new Properties();
         populateContextEnvironment(addrType, env);
 
@@ -67,7 +62,7 @@
     }
 
 
-    protected static void populateContextEnvironment(JMSAddressPolicyType addrType, Properties env) {
+    protected static void populateContextEnvironment(AddressType addrType, Properties env) {
         
         java.util.ListIterator listIter =  addrType.getJMSNamingProperty().listIterator();
 

Added: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java Thu Feb  8 08:55:52 2007
@@ -0,0 +1,59 @@
+/**
+ * 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.jms.spring;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.transport.jms.AddressType;
+import org.apache.cxf.transport.jms.ClientBehaviorPolicyType;
+import org.apache.cxf.transport.jms.ClientConfig;
+import org.apache.cxf.transport.jms.JMSConduit;
+import org.apache.cxf.transport.jms.SessionPoolType;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+
+public class JMSConduitBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+    private static final String JMS_NS = "http://cxf.apache.org/transports/jms";
+
+    @Override
+    protected void doParse(Element element, BeanDefinitionBuilder bean) {
+        bean.setAbstract(true);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "clientConfig"), "clientConfig",
+                                 ClientConfig.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "runtimePolicy"), "runtimePolicy", 
+                                 ClientBehaviorPolicyType.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "address"), "JMSAddress", 
+                                 AddressType.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool", 
+                                 SessionPoolType.class);
+    }
+    
+    @Override
+    protected String getJaxbPackage() {
+        return "org.apache.cxf.transport.jms";
+    }
+
+    @Override
+    protected Class getBeanClass(Element arg0) {
+        return JMSConduit.class;
+    }
+}

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

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

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

Added: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java Thu Feb  8 08:55:52 2007
@@ -0,0 +1,60 @@
+/**
+ * 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.jms.spring;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
+import org.apache.cxf.transport.jms.AddressType;
+import org.apache.cxf.transport.jms.JMSDestination;
+import org.apache.cxf.transport.jms.ServerBehaviorPolicyType;
+import org.apache.cxf.transport.jms.ServerConfig;
+import org.apache.cxf.transport.jms.SessionPoolType;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+
+public class JMSDestinationBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+    private static final String JMS_NS = "http://cxf.apache.org/transports/jms";
+
+    @Override
+    protected void doParse(Element element, BeanDefinitionBuilder bean) {
+        bean.setAbstract(true);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "serverConfig"), "serverConfig", 
+                                 ServerConfig.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "runtimePolicy"), "runtimePolicy", 
+                                 ServerBehaviorPolicyType.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "address"), "JMSAddress",
+                                 AddressType.class);
+        mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool", 
+                                 SessionPoolType.class);
+    }
+    
+    @Override
+    protected String getJaxbPackage() {
+        return "org.apache.cxf.transport.jms";
+    }
+
+    @Override
+    protected Class getBeanClass(Element arg0) {
+        return JMSDestination.class;
+    }
+
+}

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

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

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

Added: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/NamespaceHandler.java?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/NamespaceHandler.java (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/NamespaceHandler.java Thu Feb  8 08:55:52 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.jms.spring;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+public class NamespaceHandler extends NamespaceHandlerSupport {
+    public void init() {
+        registerBeanDefinitionParser("conduit", new JMSConduitBeanDefinitionParser());        
+        registerBeanDefinitionParser("destination", new JMSDestinationBeanDefinitionParser());        
+    }
+}

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

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

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

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/extensions.xml Thu Feb  8 08:55:52 2007
@@ -19,7 +19,7 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
-    <entry key="org.apache.cxf.transports.jms-1">javax.wsdl.Port=org.apache.cxf.transports.jms.JMSAddressPolicyType</entry>
-    <entry key="org.apache.cxf.transports.jms-2">javax.wsdl.Port=org.apache.cxf.transports.jms.JMSClientBehaviorPolicyType</entry>
-    <entry key="org.apache.cxf.transports.jms-3">javax.wsdl.Port=org.apache.cxf.transports.jms.JMSServerBehaviorPolicyType</entry>
+    <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
+    <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
+    <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
 </properties>

Added: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.handlers Thu Feb  8 08:55:52 2007
@@ -0,0 +1 @@
+http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
\ No newline at end of file

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

Added: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas?view=auto&rev=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/spring.schemas Thu Feb  8 08:55:52 2007
@@ -0,0 +1,3 @@
+http\://cxf.apache.org/transport/jms.xsd=schemas/wsdl/jms.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/jms/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb Thu Feb  8 08:55:52 2007
@@ -31,4 +31,9 @@
     <jaxb:bindings schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd" node="/xs:schema/xs:complexType[@name='tExtensibilityElement']">
         <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
     </jaxb:bindings>
+    <jaxb:bindings schemaLocation="jms.xsd" node="/xs:schema">
+        <jaxb:schemaBindings>
+            <jaxb:package name="org.apache.cxf.transport.jms"/>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
 </jaxb:bindings>

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Thu Feb  8 08:55:52 2007
@@ -17,8 +17,95 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" targetNamespace="http://cxf.apache.org/transports/jms" elementFormDefault="qualified" jaxb:version="2.0">
-    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:jms="http://cxf.apache.org/transports/jms" 
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+  targetNamespace="http://cxf.apache.org/transports/jms" 
+  elementFormDefault="qualified" jaxb:version="2.0">
+  
+    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" 
+      schemaLocation="../../../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"/>
+    
+    <!-- Spring elements -->  
+    <xs:element name="conduit" type="jms:ConduitType"/>
+    <xs:element name="destination" type="jms:DestinationType"/>
+        
+    <!-- Valid wsdl elements -->
+    <xs:element name="client" type="jms:ClientBehaviorPolicyType"/>
+    <xs:element name="server" type="jms:ServerBehaviorPolicyType"/>
+    <xs:element name="clientConfig" type="jms:ClientConfig"/>
+    <xs:element name="serverConfig" type="jms:ServerConfig"/>
+    <xs:element name="address" type="jms:AddressType"/>
+
+    <!-- Abstract Types -->
+    <xs:complexType name="DestinationType">
+        <xs:sequence>
+            <xs:element name="serverConfig" type="jms:ServerConfig" minOccurs="0"/>
+            <xs:element name="runtimePolicy" type="jms:ServerBehaviorPolicyType" minOccurs="0"/>
+            <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
+            <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string"/>
+    </xs:complexType>
+    
+    <xs:complexType name="ConduitType">
+        <xs:sequence>
+            <xs:element name="clientConfig" type="jms:ClientConfig" minOccurs="0"/>
+            <xs:element name="runtimePolicy" type="jms:ClientBehaviorPolicyType" minOccurs="0"/>
+            <xs:element name="sessionPool" type="jms:SessionPoolType" minOccurs="0"/>
+            <xs:element name="address" type="jms:AddressType" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string"/>
+    </xs:complexType>
+    
+    <xs:complexType name="SessionPoolType">
+        <xs:annotation>
+            <xs:documentation>JMS Session pool configuration policy</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="lowWaterMark" type="xs:int" default="20"/>
+        <xs:attribute name="highWaterMark" type="xs:int" default="500" />
+    </xs:complexType>
+    
+    <xs:complexType name="ClientConfig">
+        <xs:attribute name="clientReceiveTimeout" type="xs:long" default="2000"/>
+        <xs:attribute name="messageTimeToLive" type="xs:long" default="0" />
+    </xs:complexType>
+    
+    <xs:complexType name="ServerConfig">
+        <xs:attribute name="messageTimeToLive" type="xs:long" default="0" />
+        <xs:attribute name="durableSubscriptionClientId" type="xs:string" />
+    </xs:complexType>
+
+    <xs:complexType name="JMSPropertyType">
+        <xs:sequence>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="value" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    
+    <xs:complexType name="JMSMessageHeadersType">
+        <xs:annotation>
+            <xs:documentation>JMS header properties.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="property" type="jms:JMSPropertyType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="JMSCorrelationID" type="xs:string"/>
+        <xs:attribute name="JMSDeliveryMode" type="xs:int"/>
+        <xs:attribute name="JMSExpiration" type="xs:long"/>
+        <xs:attribute name="JMSMessageID" type="xs:string"/>
+        <xs:attribute name="JMSPriority" type="xs:int"/>
+        <xs:attribute name="JMSRedelivered" type="xs:boolean"/>
+        <xs:attribute name="JMSTimeStamp" type="xs:long"/>
+        <xs:attribute name="JMSType" type="xs:string"/>
+        <xs:attribute name="TimeToLive" type="xs:long"/>
+    </xs:complexType>
+    
+    <xs:simpleType name="JMSClientReceiveTimeOut">
+        <xs:restriction base="xs:long"/>
+    </xs:simpleType>
+    
     <xs:simpleType name="DestinationStyleType">
         <xs:restriction base="xs:string">
             <xs:enumeration value="queue"/>
@@ -56,7 +143,7 @@
         </xs:restriction>
     </xs:simpleType>
     
-    <xs:complexType name="JMSAddressPolicyType">
+    <xs:complexType name="AddressType">
         <xs:complexContent>
             <xs:extension base="wsdl:tExtensibilityElement">
                 <xs:sequence>
@@ -108,7 +195,7 @@
         </xs:complexContent>
     </xs:complexType>
     
-    <xs:complexType name="JMSClientBehaviorPolicyType">
+    <xs:complexType name="ClientBehaviorPolicyType">
         <xs:complexContent>
             <xs:extension base="wsdl:tExtensibilityElement">
                 <xs:attribute name="messageType" type="jms:MessageFormatType" default="text">
@@ -120,7 +207,7 @@
         </xs:complexContent>
     </xs:complexType>
     
-    <xs:complexType name="JMSServerBehaviorPolicyType">
+    <xs:complexType name="ServerBehaviorPolicyType">
         <xs:annotation>
             <xs:documentation>JMS configuration policy for CXF Server.
             These are used for configuring JMS port on CXF server side.
@@ -163,7 +250,4 @@
         </xs:complexContent>
     </xs:complexType>
     
-    <xs:element name="address" type="jms:JMSAddressPolicyType"/>
-    <xs:element name="client" type="jms:JMSClientBehaviorPolicyType"/>
-    <xs:element name="server" type="jms:JMSServerBehaviorPolicyType"/>
 </xs:schema>

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Thu Feb  8 08:55:52 2007
@@ -24,8 +24,8 @@
 
 import javax.xml.namespace.QName;
 
-
 import junit.framework.TestCase;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.message.Exchange;

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Thu Feb  8 08:55:52 2007
@@ -32,7 +32,6 @@
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
 
 
 public class JMSConduitTest extends AbstractJMSTester {
@@ -58,16 +57,15 @@
                          "HelloWorldQueueBinMsgService",
                          "HelloWorldQueueBinMsgPort");
         JMSConduit conduit = setupJMSConduit(false, false);
-        assertNotNull(conduit.config);
         assertEquals("Can't get the right ClientReceiveTimeout",
                      500,
-                     conduit.config.getClientConfig().getClientReceiveTimeout());
+                     conduit.getClientConfig().getClientReceiveTimeout());
         assertEquals("Can't get the right SessionPoolConfig's LowWaterMark",
                      10,
-                     conduit.base.getSessionPoolConfig().getLowWaterMark());
+                     conduit.getSessionPool().getLowWaterMark());
         assertEquals("Can't get the right AddressPolicy's ConnectionPassword",
                      "testPassword",
-                     conduit.base.getAddressPolicy().getConnectionPassword());
+                     conduit.getJMSAddress().getConnectionPassword());
         bus.shutdown(false);
         BusFactory.setDefaultBus(null);
         

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Thu Feb  8 08:55:52 2007
@@ -35,8 +35,6 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.context.JMSPropertyType;
 import org.easymock.classextension.EasyMock;
 
 public class JMSDestinationTest extends AbstractJMSTester {
@@ -109,16 +107,16 @@
         JMSDestination destination = setupJMSDestination(false);
         assertEquals("Can't get the right ServerConfig's MessageTimeToLive ",
                      500,
-                     destination.config.getServerConfig().getMessageTimeToLive());
+                     destination.getServerConfig().getMessageTimeToLive());
         assertEquals("Can't get the right Server's MessageSelector",
                      "cxf_message_selector",
-                     destination.config.getServer().getMessageSelector());
+                     destination.getRuntimePolicy().getMessageSelector());
         assertEquals("Can't get the right SessionPoolConfig's LowWaterMark",
                      10,
-                     destination.base.getSessionPoolConfig().getLowWaterMark());
+                     destination.getSessionPool().getLowWaterMark());
         assertEquals("Can't get the right AddressPolicy's ConnectionPassword",
                      "testPassword",
-                     destination.base.getAddressPolicy().getConnectionPassword());
+                     destination.getJMSAddress().getConnectionPassword());
         BusFactory.setDefaultBus(null);
         
     }

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java Thu Feb  8 08:55:52 2007
@@ -25,12 +25,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.cxf.transports.jms.JMSAddressPolicyType;
-import org.apache.cxf.transports.jms.JMSNamingPropertyType;
-
-//import org.apache.cxf.transports.jms.JMSAddressPolicyType;
-//import org.apache.cxf.transports.jms.JMSNamingPropertyType;
-
 public class JMSUtilsTest extends TestCase {
 
     public JMSUtilsTest(String name) {
@@ -54,7 +48,7 @@
     // This is just a place holder for now it will be chaning in next task 
     // when the new JMS address policies and configurations are introdced.
     public void testpopulateIncomingContextNonNull() throws Exception {
-        JMSAddressPolicyType addrType =  new JMSAddressPolicyType();
+        AddressType addrType =  new AddressType();
         
         JMSNamingPropertyType prop = new JMSNamingPropertyType();
         prop.setName(Context.APPLET);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java Thu Feb  8 08:55:52 2007
@@ -30,8 +30,8 @@
 import org.apache.cxf.hello_world_jms.types.NoSuchCodeLit;
 import org.apache.cxf.hello_world_jms.types.TestRpcLitFaultResponse;
 import org.apache.cxf.transport.jms.JMSConstants;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.context.JMSPropertyType;
+import org.apache.cxf.transport.jms.JMSMessageHeadersType;
+import org.apache.cxf.transport.jms.JMSPropertyType;
 
 
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Thu Feb  8 08:55:52 2007
@@ -42,8 +42,8 @@
 import org.apache.cxf.systest.common.ClientServerSetupBase;
 import org.apache.cxf.systest.common.ClientServerTestBase;
 import org.apache.cxf.transport.jms.JMSConstants;
-import org.apache.cxf.transports.jms.context.JMSMessageHeadersType;
-import org.apache.cxf.transports.jms.context.JMSPropertyType;
+import org.apache.cxf.transport.jms.JMSMessageHeadersType;
+import org.apache.cxf.transport.jms.JMSPropertyType;
 import org.apache.hello_world_doc_lit.Greeter;
 import org.apache.hello_world_doc_lit.PingMeFault;
 import org.apache.hello_world_doc_lit.SOAPService2;

Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml?view=diff&rev=504961&r1=504960&r2=504961
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_config.xml Thu Feb  8 08:55:52 2007
@@ -23,107 +23,46 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ct="http://cxf.apache.org/configuration/types"
     xmlns:jms="http://cxf.apache.org/transports/jms"
-    xmlns:jms-conf="http://cxf.apache.org/transports/jms/jms-conf"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     
-    <bean id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-conduit-base"
-        class="org.apache.cxf.transport.jms.base.JMSTransportBaseConfigBean">
-	<property name="addressPolicy">
-          <value>
-              <jms:address
-                  destinationStyle="queue"
-                  jndiConnectionFactoryName="MockConnectionFactory"
-                  jndiDestinationName="myOwnDestination"
-                  jndiReplyDestinationName="myOwnReplyDestination"
-                  connectionUserName="testUser"
-                  connectionPassword="testPassword">
-                  <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
-                  <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
-              </jms:address>
-          </value>
-      </property>
-      
-      <property name="sessionPoolConfig">
-          <value>
-              <jms-conf:sessionPoolConfig 
-                  lowWaterMark="10"
-                  highWaterMark="5000"
-              />
-          </value>
-      </property>
-  </bean>     
-
-    <bean id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-destination-base"
-        class="org.apache.cxf.transport.jms.base.JMSTransportBaseConfigBean">
-	<property name="addressPolicy">
-          <value>
-              <jms:address
-                  destinationStyle="queue"
-                  jndiConnectionFactoryName="MockConnectionFactory"
-                  jndiDestinationName="myOwnDestination"
-                  jndiReplyDestinationName="myOwnReplyDestination"
-                  connectionUserName="testUser"
-                  connectionPassword="testPassword">
-                  <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
-                  <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
-              </jms:address>
-          </value>
-      </property>
-      
-      <property name="sessionPoolConfig">
-          <value>
-              <jms-conf:sessionPoolConfig 
-                  lowWaterMark="10"
-                  highWaterMark="5000"
-              />
-          </value>
-      </property>
-  </bean>     
-	
-
-  <bean id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-conduit"
-        class="org.apache.cxf.transport.jms.conduit.JMSConduitConfigBean">
-      
-      <property name="client">
-          <value>
-              <jms:client messageType="binary"/>
-          </value>
-      </property>
-     
-           
-      <property name="clientConfig">
-          <value>
-              <jms-conf:clientConfig
-                  clientReceiveTimeout="500"
-                  messageTimeToLive="500"
-              />
-          </value>
-      </property>
-      
-  </bean>
-  
-  <bean id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-destination"
-        class="org.apache.cxf.transport.jms.destination.JMSDestinationConfigBean">
-
-      <property name="server">
-          <value>
-             <jms:server                   
-                 messageSelector="cxf_message_selector"
-                 useMessageIDAsCorrelationID="true"
-                 transactional="true"
-                 durableSubscriberName="cxf_subscriber"
-             />
-          </value>
-      </property>
-
-    <property name="serverConfig">
-        <value>
-            <jms-conf:serverConfig
-                messageTimeToLive="500"
-                durableSubscriptionClientId="test-server-id"
-            />
-        </value>
-      </property>
-  </bean>
+    <jms:conduit id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-conduit">
+      <jms:address
+          destinationStyle="queue"
+          jndiConnectionFactoryName="MockConnectionFactory"
+          jndiDestinationName="myOwnDestination"
+          jndiReplyDestinationName="myOwnReplyDestination"
+          connectionUserName="testUser"
+          connectionPassword="testPassword">
+          <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
+          <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
+      </jms:address>
+      <jms:sessionPool lowWaterMark="10" highWaterMark="5000"/>
+      <jms:runtimePolicy messageType="binary"/>
+      <jms:clientConfig clientReceiveTimeout="500" messageTimeToLive="500"/>
+    </jms:conduit>
+    
+    <jms:destination id="{http://cxf.apache.org/jms_conf_test}HelloWorldQueueBinMsgPort.jms-destination">
+      <jms:address
+          destinationStyle="queue"
+          jndiConnectionFactoryName="MockConnectionFactory"
+          jndiDestinationName="myOwnDestination"
+          jndiReplyDestinationName="myOwnReplyDestination"
+          connectionUserName="testUser"
+          connectionPassword="testPassword">
+          <jms:JMSNamingProperty name="java.naming.factory.initial" value="org.apache.cxf.transport.jms.MockInitialContextFactory"/>
+          <jms:JMSNamingProperty name="java.naming.provider.url" value="tcp://localhost:61616"/>
+      </jms:address>
+      <jms:sessionPool
+          lowWaterMark="10"
+          highWaterMark="5000"/>
+      <jms:runtimePolicy               
+         messageSelector="cxf_message_selector"
+         useMessageIDAsCorrelationID="true"
+         transactional="true"
+         durableSubscriberName="cxf_subscriber"/>
+      <jms:serverConfig
+        messageTimeToLive="500"
+        durableSubscriptionClientId="test-server-id"/>
+  </jms:destination>  
 
 </beans>



Mime
View raw message