cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r703670 - in /cxf/branches/2.0.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ rt/transports/jms/src/main/resources/schemas/wsdl/
Date Sat, 11 Oct 2008 14:58:37 GMT
Author: ningjiang
Date: Sat Oct 11 07:58:36 2008
New Revision: 703670

URL: http://svn.apache.org/viewvc?rev=703670&view=rev
Log:
Merged revisions 703660 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r703660 | ningjiang | 2008-10-11 21:56:41 +0800 (Sat, 11 Oct 2008) | 9 lines
  
  Merged revisions 703635 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r703635 | cschneider | 2008-10-11 15:34:20 +0800 (Sat, 11 Oct 2008) | 1 line
    
    added config element for jms11 setting
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=703670&r1=703669&r2=703670&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
Sat Oct 11 07:58:36 2008
@@ -33,7 +33,7 @@
     private DestinationResolver destinationResolver;
     private PlatformTransactionManager transactionManager;
     private TaskExecutor taskExecutor;
-    private boolean useJms11 = true;
+    private boolean useJms11;
     private boolean useJndi;
     private boolean messageIdEnabled = true;
     private boolean messageTimestampEnabled = true;

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=703670&r1=703669&r2=703670&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Sat Oct 11 07:58:36 2008
@@ -116,7 +116,9 @@
         long timeToLive = isConduit ? clientConfig.getMessageTimeToLive() : serverConfig
             .getMessageTimeToLive();
         jmsConfig.setTimeToLive(timeToLive);
-        jmsConfig.setUseJms11(true);
+        if (address.isSetUseJms11()) {
+            jmsConfig.setUseJms11(address.isUseJms11());
+        }
         boolean useJndi = address.isSetJndiDestinationName();
         jmsConfig.setUseJndi(useJndi);
         jmsConfig.setSessionTransacted(serverBehavior.isSetTransactional());

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=703670&r1=703669&r2=703670&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd Sat
Oct 11 07:58:36 2008
@@ -133,76 +133,93 @@
     </xs:simpleType>
     
     <xs:complexType name="AddressType">
-        <xs:complexContent>
-            <xs:extension base="wsdl:tExtensibilityElement">
-                <xs:sequence>
-                    <xs:element name="JMSNamingProperty" type="jms:JMSNamingPropertyType"
minOccurs="0" maxOccurs="unbounded" />
-                </xs:sequence>
-                <xs:attribute name="destinationStyle" type="jms:DestinationStyleType"
default="queue">
-                    <xs:annotation>
-                        <xs:documentation>
-                          JMS Destination style queue or topic.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                
-                <xs:attribute name="jndiConnectionFactoryName" type="xs:string" use="required">
-                    <xs:annotation>
-                        <xs:documentation>
-                          Type of the JNDI Connection factory queueConnectionFactory or topicConnectionFactory.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                <xs:attribute name="jndiDestinationName" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                          Name of the JNDI Destination queue or topic.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                
-                <xs:attribute name="jmsDestinationName" type="xs:string">
-                	<xs:annotation>
-                		<xs:documentation>
-                			JMS destination queue name or topic name.
-                		</xs:documentation>
-                	</xs:annotation>
-                </xs:attribute>
-                
-                <xs:attribute name="jndiReplyDestinationName" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                          JMS Message Replyto destination when static queues are used for
reply.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                
-                <xs:attribute name="jmsReplyDestinationName" type="xs:string">
-                	<xs:annotation>
-                		<xs:documentation>
-                			JMS Replyto destination queue name when using static queues for reply.
-                		</xs:documentation>
-                	</xs:annotation>
-                </xs:attribute>
-                
-                <xs:attribute name="connectionUserName" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                            UserName to use while creating JMS queue/topic connection.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-                <xs:attribute name="connectionPassword" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>
-                            Password to use while creating JMS queue/topic connection.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
+    	<xs:complexContent>
+    		<xs:extension base="wsdl:tExtensibilityElement">
+    			<xs:sequence>
+    				<xs:element name="JMSNamingProperty"
+    					type="jms:JMSNamingPropertyType" minOccurs="0"
+    					maxOccurs="unbounded" />
+    			</xs:sequence>
+    			<xs:attribute name="destinationStyle"
+    				type="jms:DestinationStyleType" default="queue">
+    				<xs:annotation>
+    					<xs:documentation>
+    						JMS Destination style queue or topic.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+
+    			<xs:attribute name="jndiConnectionFactoryName"
+    				type="xs:string" use="required">
+    				<xs:annotation>
+    					<xs:documentation>
+    						Type of the JNDI Connection factory
+    						queueConnectionFactory or
+    						topicConnectionFactory.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+    			<xs:attribute name="jndiDestinationName"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						Name of the JNDI Destination queue or topic.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+
+    			<xs:attribute name="jmsDestinationName"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						JMS destination queue name or topic name.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+
+    			<xs:attribute name="jndiReplyDestinationName"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						JMS Message Replyto destination when static
+    						queues are used for reply.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+
+    			<xs:attribute name="jmsReplyDestinationName"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						JMS Replyto destination queue name when
+    						using static queues for reply.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+
+    			<xs:attribute name="connectionUserName"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						UserName to use while creating JMS
+    						queue/topic connection.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+    			<xs:attribute name="connectionPassword"
+    				type="xs:string">
+    				<xs:annotation>
+    					<xs:documentation>
+    						Password to use while creating JMS
+    						queue/topic connection.
+    					</xs:documentation>
+    				</xs:annotation>
+    			</xs:attribute>
+    			<xs:attribute name="useJms11" type="xs:boolean" use="optional"></xs:attribute>
+    		</xs:extension>
+    	</xs:complexContent>
     </xs:complexType>
-    
+
     <xs:complexType name="ClientBehaviorPolicyType">
         <xs:complexContent>
             <xs:extension base="wsdl:tExtensibilityElement">



Mime
View raw message