You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/04/20 15:51:55 UTC
svn commit: r766690 - in /tuscany/branches/sca-java-1.5/modules/binding-jms:
./ src/main/java/org/apache/tuscany/sca/binding/jms/impl/
Author: antelder
Date: Mon Apr 20 13:51:55 2009
New Revision: 766690
URL: http://svn.apache.org/viewvc?rev=766690&view=rev
Log:
Merge TUSCANY-2976 change Remove default 'ConnectionFactory' in JMSBinding model from 1x to 1.5
Modified:
tuscany/branches/sca-java-1.5/modules/binding-jms/ (props changed)
tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
Propchange: tuscany/branches/sca-java-1.5/modules/binding-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 20 13:51:55 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jms:671193
+/tuscany/branches/sca-java-1.x/modules/binding-jms:766689
Modified: tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java?rev=766690&r1=766689&r2=766690&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java (original)
+++ tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java Mon Apr 20 13:51:55 2009
@@ -82,7 +82,7 @@
private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
private Map<String, BindingProperty> destinationProperties = new HashMap<String, BindingProperty>();
- private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
+ private String connectionFactoryName = null;
private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
private Map<String, BindingProperty> connectionFactoryProperties = new HashMap<String, BindingProperty>();
Modified: tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java?rev=766690&r1=766689&r2=766690&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java (original)
+++ tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java Mon Apr 20 13:51:55 2009
@@ -48,7 +48,6 @@
String CREATE_ALWAYS = "always";
String CREATE_NEVER = "never";
String CREATE_IF_NOT_EXIST = "ifnotexist";
- String DEFAULT_CONNECTION_FACTORY_NAME = "ConnectionFactory";
String DEFAULT_CONTEXT_FACTORY_NAME = "org.apache.activemq.jndi.ActiveMQInitialContextFactory";
String DEFAULT_JNDI_URL = "tcp://localhost:61616";
int DEFAULT_TIME_TO_LIVE = 20000; // in milliseconds
Modified: tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java?rev=766690&r1=766689&r2=766690&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java (original)
+++ tuscany/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java Mon Apr 20 13:51:55 2009
@@ -843,8 +843,7 @@
}
// Connection factory and activation Specification are mutually exclusive.
- if (( connectionFactoryName != null ) && ( connectionFactoryName.length() > 0 )
- && !JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME.equals(connectionFactoryName) ) {
+ if (( connectionFactoryName != null ) && ( connectionFactoryName.length() > 0 )) {
String activationSpecName = jmsBinding.getActivationSpecName();
if ((activationSpecName != null) && (activationSpecName.length() > 0 )) {
error("ConnectionFactoryActivationSpecContradiction", jmsBinding, connectionFactoryName, activationSpecName );
@@ -939,9 +938,9 @@
String responseDestName = jmsBinding.getResponseDestinationName();
String responseCFName = jmsBinding.getResponseConnectionFactoryName();
String responseASName = jmsBinding.getResponseActivationSpecName();
- if (( responseDestName != null ) ||
- (responseCFName != null && !responseCFName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME)) ||
- responseASName != null ) {
+ if ( responseDestName != null ||
+ responseCFName != null ||
+ responseASName != null ) {
writer.writeStartElement("response");
writeResponseDestinationProperties( jmsBinding, writer );
@@ -1277,9 +1276,6 @@
if (cfName == null || (cfName.length() < 1)) {
return;
}
- if ( cfName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME) ) {
- return;
- }
writer.writeStartElement("connectionFactory");
@@ -1387,9 +1383,6 @@
if (cfName == null || (cfName.length() < 1)) {
return;
}
- if (cfName.equals(JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME)) {
- return;
- }
writer.writeStartElement("connectionFactory");