From e0ff67c0b32813ea48734c770a5ffc1952644e29 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:02 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835128 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/jms/impl/JMSBinding.java | 516 --------------------- .../sca/binding/jms/impl/JMSBindingConstants.java | 65 --- .../sca/binding/jms/impl/JMSBindingException.java | 45 -- .../sca/binding/jms/impl/JMSBindingProcessor.java | 430 ----------------- .../jms/provider/AbstractMessageProcessor.java | 117 ----- .../binding/jms/provider/JMSBindingInvoker.java | 273 ----------- .../binding/jms/provider/JMSBindingListener.java | 169 ------- .../jms/provider/JMSBindingProviderFactory.java | 62 --- .../JMSBindingReferenceBindingProvider.java | 142 ------ .../provider/JMSBindingServiceBindingProvider.java | 227 --------- .../binding/jms/provider/JMSMessageProcessor.java | 55 --- .../binding/jms/provider/JMSResourceFactory.java | 175 ------- .../jms/provider/ObjectMessageProcessor.java | 70 --- .../binding/jms/provider/TextMessageProcessor.java | 69 --- .../jms/provider/XMLTextMessageProcessor.java | 91 ---- ...ca.contribution.processor.StAXArtifactProcessor | 19 - ...che.tuscany.sca.provider.BindingProviderFactory | 19 - .../binding-jms-validation-messages.properties | 41 -- .../sca/binding/jms/HelloWorldClientImpl.java | 43 -- .../tuscany/sca/binding/jms/HelloWorldService.java | 31 -- .../sca/binding/jms/HelloWorldServiceImpl.java | 32 -- .../jms/OperationSelectionTestCaseFIXME.java | 238 ---------- ...ndingReferenceQueueCreateModeTestCaseFIXME.java | 326 ------------- ...BindingServiceQueueCreateModeTestCaseFIXME.java | 172 ------- .../src/test/resources/simple/client.composite | 38 -- .../src/test/resources/simple/service.composite | 35 -- 26 files changed, 3500 deletions(-) delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/client.composite delete mode 100644 branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/service.composite (limited to 'branches/sca-java-1.3.1/modules/binding-jms/src') diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java deleted file mode 100644 index cdab5382d7..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java +++ /dev/null @@ -1,516 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.impl; - -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.List; - -import javax.jms.DeliveryMode; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor; - -/** - * Models a binding to a JMS resource. - * - * @version $Rev$ $Date$ - */ - -public class JMSBinding implements Binding { - - /** - * Clone the binding - */ - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - // properties required to implement the Tuscany - // binding extension SPI - private String uri = null; - private String name = null; - private boolean unresolved = false; - private List extensions = new ArrayList(); - - // Properties required to describe the JMS - // binding model - - // - private String correlationScheme = JMSBindingConstants.CORRELATE_MSG_ID; - private String initialContextFactoryName; - private String jndiURL; - // private String requestConnection = null; - // private String responseConnection = null; - // private String operationProperties = null; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String destinationName = JMSBindingConstants.DEFAULT_DESTINATION_NAME; - private String destinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE; - private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME; - private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String activationSpecName = null; - private String activationSpecCreate = null; - // - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String responseDestinationName = JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME; - private String responseDestinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE; - private String responseDestinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String responseConnectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME; - private String responseConnectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - private String responseActivationSpecName = null; - private String responseActivationSpecCreate = null; - // ? - // - // ? Not yet implemented in binding - // * Not yet implemented in binding - // ? - // private String resourceAdapterName = null; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - // private String jmsType = null; - // private String jmsCorrelationId = null; - private int jmsDeliveryMode = DeliveryMode.NON_PERSISTENT; // Maps to javax.jms.DeliveryMode - private int jmsTimeToLive = JMSBindingConstants.DEFAULT_TIME_TO_LIVE; - private int jmsPriority = JMSBindingConstants.DEFAULT_PRIORITY; - // - // Not yet implemented in binding - // * Not yet implemented in binding - // Not yet implemented in binding - // * Not yet implemented in binding - // ? - // * - // - - // Other properties not directly related to the - // XML definition of the JMS binding - - // Provides the name of the factory that interfaces to the - // JMS API for us. - private String jmsResourceFactoryName = JMSBindingConstants.DEFAULT_RF_CLASSNAME; - - // Message processors used to deal with the request - // and response messages - public String requestMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME; - public String responseMessageProcessorName = JMSBindingConstants.DEFAULT_MP_CLASSNAME; - - // The JMS message property used to hold the name of the - // operation being called - private String operationSelectorPropertyName = JMSBindingConstants.DEFAULT_OPERATION_PROP_NAME; - - // If the operation selector is derived automatically from the service - // interface it's stored here - private String operationSelectorName = null; - - // TODO ..... - private String replyTo; - - // Methods required by the Tuscany SPI - - /** - * No arg constructor used by the JSMBindingFactoryImpl to create JMS binding model objects - */ - public JMSBinding() { - super(); - } - - /** - * Returns the binding URI. - * - * @return the binding URI - */ - public String getURI() { - return this.uri; - } - - /** - * Sets the binding URI. - * - * @param uri the binding URI - */ - public void setURI(String uri) { - this.uri = uri; - } - - /** - * Returns the binding name. - * - * @return the binding name - */ - public String getName() { - return this.name; - } - - /** - * Sets the binding name. - * - * @param name the binding name - */ - public void setName(String name) { - this.name = name; - } - - public boolean isUnresolved() { - return this.unresolved; - } - - public void setUnresolved(boolean unresolved) { - this.unresolved = unresolved; - } - - public List getExtensions() { - return extensions; - } - - // Methods for getting/setting JMS binding model information - // as derived from the XML of the binding.jms element - - public void setCorrelationScheme(String correlationScheme) { - this.correlationScheme = correlationScheme; - } - - public String getCorrelationScheme() { - return correlationScheme; - } - - public String getInitialContextFactoryName() { - return initialContextFactoryName; - } - - public void setInitialContextFactoryName(String initialContextFactoryName) { - this.initialContextFactoryName = initialContextFactoryName; - } - - public String getJndiURL() { - return this.jndiURL; - } - - public void setJndiURL(String jndiURL) { - this.jndiURL = jndiURL; - } - - public String getDestinationName() { - return destinationName; - } - - public void setDestinationName(String destinationName) { - this.destinationName = destinationName; - } - - public String getDestinationType() { - return destinationType; - } - - public void setDestinationType(String destinationType) { - this.destinationType = destinationType; - } - - public String getDestinationCreate() { - return this.destinationCreate; - } - - public void setDestinationCreate(String create) { - this.destinationCreate = create; - } - - public String getConnectionFactoryName() { - return connectionFactoryName; - } - - public void setConnectionFactoryName(String connectionFactoryName) { - this.connectionFactoryName = connectionFactoryName; - } - - public String getConnectionFactoryCreate() { - return this.connectionFactoryCreate; - } - - public void setConnectionFactoryCreate(String create) { - this.connectionFactoryCreate = create; - } - - public String getActivationSpecName() { - return activationSpecName; - } - - public void setActivationSpecName(String activationSpecName) { - this.activationSpecName = activationSpecName; - } - - public String getActivationSpecCreate() { - return this.activationSpecCreate; - } - - public void setActivationSpecCreate(String create) { - this.activationSpecCreate = create; - } - - public String getResponseDestinationName() { - return this.responseDestinationName; - } - - public void setResponseDestinationName(String name) { - this.responseDestinationName = name; - } - - public String getResponseDestinationType() { - return this.responseDestinationType; - } - - public void setResponseDestinationType(String type) { - this.responseDestinationType = type; - } - - public String getResponseDestinationCreate() { - return this.responseDestinationCreate; - } - - public void setResponseDestinationCreate(String create) { - this.responseDestinationCreate = create; - } - - public String getResponseConnectionFactoryName() { - return responseConnectionFactoryName; - } - - public void setResponseConnectionFactoryName(String connectionFactoryName) { - this.responseConnectionFactoryName = connectionFactoryName; - } - - public String getResponseConnectionFactoryCreate() { - return this.responseConnectionFactoryCreate; - } - - public void setResponseConnectionFactoryCreate(String create) { - this.responseConnectionFactoryCreate = create; - } - - public String getResponseActivationSpecName() { - return responseActivationSpecName; - } - - public void setResponseActivationSpecName(String activationSpecName) { - this.responseActivationSpecName = activationSpecName; - } - - public String getResponseActivationSpecCreate() { - return this.responseActivationSpecCreate; - } - - public void setResponseActivationSpecCreate(String create) { - this.responseActivationSpecCreate = create; - } - - public int getDeliveryMode() { - return jmsDeliveryMode; - } - - public void setDeliveryMode(int deliveryMode) { - this.jmsDeliveryMode = deliveryMode; - } - - public int getTimeToLive() { - return jmsTimeToLive; - } - - public void setTimeToLive(int timeToLive) { - this.jmsTimeToLive = timeToLive; - } - - public int getPriority() { - return jmsPriority; - } - - public void setPriority(int priority) { - this.jmsPriority = priority; - } - - // operations to manage the other information required by the - // JMS binding - - public String getJmsResourceFactoryName() { - return jmsResourceFactoryName; - } - - public void setJmsResourceFactoryName(String jmsResourceFactoryName) { - this.jmsResourceFactoryName = jmsResourceFactoryName; - } - -// public JMSResourceFactory getJmsResourceFactory() { -// return (JMSResourceFactory)instantiate(null, jmsResourceFactoryName); -// } - - public void setRequestMessageProcessorName(String name) { - this.requestMessageProcessorName = name; - } - - public String getRequestMessageProcessorName() { - return requestMessageProcessorName; - } - - public JMSMessageProcessor getRequestMessageProcessor() { - return (JMSMessageProcessor)instantiate(null, requestMessageProcessorName); - } - - public void setResponseMessageProcessorName(String name) { - this.responseMessageProcessorName = name; - } - - public String getResponseMessageProcessorName() { - return responseMessageProcessorName; - } - - public JMSMessageProcessor getResponseMessageProcessor() { - return (JMSMessageProcessor)instantiate(null, responseMessageProcessorName); - } - - public String getOperationSelectorPropertyName() { - return operationSelectorPropertyName; - } - - public void setOperationSelectorPropertyName(String operationSelectorPropertyName) { - this.operationSelectorPropertyName = operationSelectorPropertyName; - } - - public String getOperationSelectorName() { - return operationSelectorName; - } - - public void setOperationSelectorName(String operationSelectorName) { - this.operationSelectorName = operationSelectorName; - } - - /** - * Used to create instances of the JMSResourceFactory and RequestMessageProcessor and ResponseMessageProcessor from - * string based class name provided in the configuration - * - * @param cl ClassLoader - * @param className the string based class name to load and instantiate - * @return the new object - */ - private Object instantiate(ClassLoader cl, String className) { - Object instance; - if (cl == null) { - cl = this.getClass().getClassLoader(); - } - - try { - Class clazz; - - try { - clazz = cl.loadClass(className); - } catch (ClassNotFoundException e) { - clazz = this.getClass().getClassLoader().loadClass(className); - } - - Constructor constructor = clazz.getDeclaredConstructor(new Class[] {JMSBinding.class}); - instance = constructor.newInstance(this); - - } catch (Throwable e) { - throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e); - } - - return instance; - } - - /** - * The validation rules for the JMS model are relatively complicated to they all live together here - */ - public void validate() throws JMSBindingException { - /* - * first fix up anything now the model has been read - */ - - /* - * Now some cross field validation - */ - - // connection factory doesn't contradict destination type - // connection factory and activation Specification are mutually exclusive - // TODO check Specification for all validations - } - - // TODO... - - public String getReplyTo() { - return replyTo; - } - - public void setReplyTo(String replyTo) { - this.replyTo = replyTo; - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java deleted file mode 100644 index c6267117b4..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.impl; - -import java.util.Arrays; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor; - -/** - * Constants for the JMS binding. - * - * @version $Rev$ $Date$ - */ -public interface JMSBindingConstants { - - // Constants used when describing the JMS binding - // model and for setting up defaults - String BINDING_JMS = "binding.jms"; - QName BINDING_JMS_QNAME = new QName(Constants.SCA10_NS, BINDING_JMS); - String CORRELATE_MSG_ID = "requestmsgidtocorrelid"; - String CORRELATE_CORRELATION_ID = "requestcorrelidtocorrelid"; - String CORRELATE_NONE = "none"; - List VALID_CORRELATION_SCHEMES = - Arrays.asList(new String[] {CORRELATE_MSG_ID, CORRELATE_CORRELATION_ID, CORRELATE_NONE}); - String DESTINATION_TYPE_QUEUE = "queue"; // 0 - String DESTINATION_TYPE_TOPIC = "topic"; // 1 - List VALID_DESTINATION_TYPES = - Arrays.asList(new String[] {DESTINATION_TYPE_QUEUE, DESTINATION_TYPE_TOPIC}); - String CREATE_ALWAYS = "always"; - String CREATE_NEVER = "never"; - String CREATE_IF_NOT_EXIST = "ifnotexist"; - String DEFAULT_DESTINATION_NAME = "NODESTINATION"; - String DEFAULT_RESPONSE_DESTINATION_NAME = "NORESPONSEDESTINATION"; - 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 - int DEFAULT_PRIORITY = 1; - String DEFAULT_RF_CLASSNAME = "org.apache.tuscany.sca.host.jms.activemq.JMSResourceFactoryImpl"; - String DEFAULT_MP_CLASSNAME = XMLTextMessageProcessor.class.getName(); - String DEFAULT_OPERATION_PROP_NAME = "scaOperationName"; - - String FAULT_PROPERTY = "org.apache.tuscany.sca.fault"; - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java deleted file mode 100644 index 0928e02082..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.impl; - -/** - * Base exception for the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingException extends RuntimeException { - private static final long serialVersionUID = 1L; - - public JMSBindingException() { - super(); - } - - public JMSBindingException(String arg0, Throwable arg1) { - super(arg0, arg1); - } - - public JMSBindingException(String arg0) { - super(arg0); - } - - public JMSBindingException(Throwable arg0) { - super(arg0); - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java deleted file mode 100644 index e2243e8fdf..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java +++ /dev/null @@ -1,430 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.impl; - -import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; - -import java.util.StringTokenizer; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl; -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor; -import org.apache.tuscany.sca.binding.jms.provider.ObjectMessageProcessor; -import org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor; -import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.contribution.service.ContributionWriteException; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.Problem.Severity; -import org.apache.tuscany.sca.policy.PolicyFactory; - -/** - * A processor to read the XML that describes the JMS binding... - * - * - * - * - * * - * ? - * - * - * * - * ? - * - * - * * - * ? - * - * - * - * * - * ? - * - * - * * - * ? - * - * - * * - * ? - * ? - * - * ? - * * - * ? - * - * - * * - * ? - * - * - * * - * - * * - * ? - * * - * - * - * @version $Rev$ $Date$ - */ - -public class JMSBindingProcessor implements StAXArtifactProcessor { - - private PolicyFactory policyFactory; - private PolicyAttachPointProcessor policyProcessor; - private Monitor monitor; - - public JMSBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) { - this.policyFactory = modelFactories.getFactory(PolicyFactory.class); - this.policyProcessor = new PolicyAttachPointProcessor(policyFactory); - this.monitor = monitor; - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void warning(String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - - /** - * Report a error. - * - * @param problems - * @param message - * @param model - */ - private void error(String message, Object model, Object... messageParameters) { - if (monitor != null) { - Problem problem = new ProblemImpl(this.getClass().getName(), "binding-jms-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); - monitor.problem(problem); - } - } - - public QName getArtifactType() { - return JMSBindingConstants.BINDING_JMS_QNAME; - } - - public Class getModelType() { - return JMSBinding.class; - } - - public JMSBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { - JMSBinding jmsBinding = new JMSBinding(); - - // Read policies - policyProcessor.readPolicies(jmsBinding, reader); - - // Read binding name - String name = reader.getAttributeValue(null, "name"); - if (name != null) { - jmsBinding.setName(name); - } - - // Read binding URI - String uri = reader.getAttributeValue(null, "uri"); - if (uri != null && uri.length() > 0) { - parseURI(uri, jmsBinding); - } - - // Read correlation scheme - String correlationScheme = reader.getAttributeValue(null, "correlationScheme"); - if (correlationScheme != null && correlationScheme.length() > 0) { - if (JMSBindingConstants.VALID_CORRELATION_SCHEMES.contains(correlationScheme.toLowerCase())) { - jmsBinding.setCorrelationScheme(correlationScheme); - } else { - error("InvalidCorrelationScheme", reader, correlationScheme); - //throw new JMSBindingException("invalid correlationScheme: " + correlationScheme); - } - } - - // Read initial context factory - String initialContextFactory = reader.getAttributeValue(null, "initialContextFactory"); - if (initialContextFactory != null && initialContextFactory.length() > 0) { - jmsBinding.setInitialContextFactoryName(initialContextFactory); - } - - // Read JNDI URL - String jndiURL = reader.getAttributeValue(null, "jndiURL"); - if (jndiURL != null && jndiURL.length() > 0) { - jmsBinding.setJndiURL(jndiURL); - } - - // Read message processor class name - String messageProcessorName = reader.getAttributeValue(null, "messageProcessor"); - if (messageProcessorName != null && messageProcessorName.length() > 0) { - if ("XMLTextMessage".equalsIgnoreCase(messageProcessorName)) { - messageProcessorName = XMLTextMessageProcessor.class.getName(); - } else if ("TextMessage".equalsIgnoreCase(messageProcessorName)) { - messageProcessorName = TextMessageProcessor.class.getName(); - } else if ("ObjectMessage".equalsIgnoreCase(messageProcessorName)) { - messageProcessorName = ObjectMessageProcessor.class.getName(); - } - jmsBinding.setRequestMessageProcessorName(messageProcessorName); - jmsBinding.setResponseMessageProcessorName(messageProcessorName); - - } - - // Read requestConnection - // TODO - // Read reponseConnection - // TODO - // Read operationProperties - // TODO - - // Read sub-elements of binding.jms - boolean endFound = false; - while (!endFound) { - switch (reader.next()) { - case START_ELEMENT: - String elementName = reader.getName().getLocalPart(); - if ("destination".equals(elementName)) { - parseDestination(reader, jmsBinding); - } else if ("connectionFactory".equals(elementName)) { - parseConnectionFactory(reader, jmsBinding); - } else if ("activationSpec".equals(elementName)) { - parseActivationSpec(reader, jmsBinding); - } else if ("response".equals(elementName)) { - parseResponse(reader, jmsBinding); - } else if ("resourceAdapter".equals(elementName)) { - parseResourceAdapter(reader, jmsBinding); - } else if ("headers".equals(elementName)) { - parseHeaders(reader, jmsBinding); - } else if ("operationProperties".equals(elementName)) { - parseOperationProperties(reader, jmsBinding); - } - reader.next(); - break; - case END_ELEMENT: - QName x = reader.getName(); - if (x.equals(JMSBindingConstants.BINDING_JMS_QNAME)) { - endFound = true; - } else { - error("UnexpectedElement", reader, x.toString()); - //throw new RuntimeException("Incomplete binding.jms definition found unexpected element " - //+ x.toString()); - } - } - } - - jmsBinding.validate(); - - return jmsBinding; - } - - protected void parseURI(String uri, JMSBinding jmsBinding) { - if (!uri.startsWith("jms:")) { - error("MustStartWithSchema", jmsBinding, uri); - //throw new JMSBindingException("uri must start with the scheme 'jms:' for uri: " + uri); - return; - } - int i = uri.indexOf('?'); - if (i >= 0) { - StringTokenizer st = new StringTokenizer(uri.substring(i+1),"&"); - while (st.hasMoreTokens()) { - String s = st.nextToken(); - if (s.startsWith("connectionFactoryName=")) { - jmsBinding.setConnectionFactoryName(s.substring(22)); - } else { - error("UnknownTokenInURI", jmsBinding, s, uri); - //throw new JMSBindingException("unknown token '" + s + "' in uri: " + uri); - return; - } - } - jmsBinding.setDestinationName(uri.substring(4, i)); - } else { - jmsBinding.setDestinationName(uri.substring(4)); - } - } - - public void resolve(JMSBinding model, ModelResolver resolver) throws ContributionResolveException { - } - - public void write(JMSBinding rmiBinding, XMLStreamWriter writer) throws ContributionWriteException, - XMLStreamException { - // Write a - writer.writeStartElement(Constants.SCA10_NS, JMSBindingConstants.BINDING_JMS); - - // FIXME Implement - - writer.writeEndElement(); - } - - private void parseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - jmsBinding.setDestinationName(name); - } - - String type = reader.getAttributeValue(null, "type"); - if (type != null && type.length() > 0) { - warning("DoesntProcessDestinationType", jmsBinding); - if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) { - jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE); - } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) { - jmsBinding.setDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC); - } else { - warning("InvalidDestinationType", reader, type); - } - } - - String create = reader.getAttributeValue(null, "create"); - if (create != null && create.length() > 0) { - jmsBinding.setDestinationCreate(create); - } - } - - private void parseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - jmsBinding.setConnectionFactoryName(name); - } else { - error("MissingConnectionFactoryName", reader); - //throw new RuntimeException("missing connectionFactory name"); - } - } - - private void parseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - warning("DoesntProcessActivationSpec", jmsBinding); - jmsBinding.setActivationSpecName(name); - } else { - warning("MissingActivationSpecName", reader); - } - } - - private void parseResponseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - jmsBinding.setResponseDestinationName(name); - } - - String type = reader.getAttributeValue(null, "type"); - if (type != null && type.length() > 0) { - warning("DoesntProcessResponseDestinationType", jmsBinding); - if (JMSBindingConstants.DESTINATION_TYPE_QUEUE.equalsIgnoreCase(type)) { - jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_QUEUE); - } else if (JMSBindingConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(type)) { - jmsBinding.setResponseDestinationType(JMSBindingConstants.DESTINATION_TYPE_TOPIC); - } else { - warning("InvalidResponseDestinationType", reader, type); - } - } - - String create = reader.getAttributeValue(null, "create"); - if (create != null && create.length() > 0) { - jmsBinding.setResponseDestinationCreate(create); - } - } - - private void parseResponseConnectionFactory(XMLStreamReader reader, JMSBinding jmsBinding) { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - warning("DoesntProcessResponseConnectionFactory", jmsBinding); - jmsBinding.setResponseConnectionFactoryName(name); - } else { - warning("MissingResponseConnectionFactory", reader); - } - } - - private void parseResponseActivationSpec(XMLStreamReader reader, JMSBinding jmsBinding) { - String name = reader.getAttributeValue(null, "name"); - if (name != null && name.length() > 0) { - warning("DoesntProcessResponseActivationSpec", jmsBinding); - jmsBinding.setResponseActivationSpecName(name); - } else { - warning("MissingResponseActivationSpec", reader); - } - } - - private void parseResponse(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - // Read sub-elements of response - while (true) { - switch (reader.next()) { - case START_ELEMENT: - String elementName = reader.getName().getLocalPart(); - if ("destination".equals(elementName)) { - parseResponseDestination(reader, jmsBinding); - } else if ("connectionFactory".equals(elementName)) { - parseResponseConnectionFactory(reader, jmsBinding); - } else if ("activationSpec".equals(elementName)) { - parseResponseActivationSpec(reader, jmsBinding); - } - reader.next(); - break; - case END_ELEMENT: - QName x = reader.getName(); - if (x.getLocalPart().equals("response")) { - return; - } else { - error("UnexpectedResponseElement", reader, x.toString()); - //throw new RuntimeException("Incomplete binding.jms/response definition found unexpected element " - //+ x.toString()); - } - } - } - } - - private void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - warning("DoesntProcessResourceAdapter", jmsBinding); - } - - private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - warning("DoesntProcessHeaders", jmsBinding); - } - - private void parseOperationProperties(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException { - warning("DoesntProcessOperationProperties", jmsBinding); - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java deleted file mode 100644 index 0b7de9f401..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.Session; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Base MessageProcessor for the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public abstract class AbstractMessageProcessor implements JMSMessageProcessor { - - protected String operationPropertyName; - protected boolean xmlFormat = true; - - public AbstractMessageProcessor(JMSBinding jmsBinding) { - this.operationPropertyName = jmsBinding.getOperationSelectorPropertyName(); - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#getOperationName(javax.jms.Message) - */ - public String getOperationName(Message message) { - try { - - return message.getStringProperty(operationPropertyName); - - } catch (JMSException e) { - throw new JMSBindingException("Exception retreiving operation name from message", e); - } - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#setOperationName(javax.jms.Message, java.lang.String) - */ - public void setOperationName(String operationName, Message message) { - try { - - message.setStringProperty(operationPropertyName, operationName); - - } catch (JMSException e) { - throw new JMSBindingException("Exception setting the operation name on message", e); - } - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Session, java.lang.Object) - */ - public Message insertPayloadIntoJMSMessage(Session session, Object o) { - return createJMSMessage(session, o); - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.OperationAndDataBinding#extractPayload(javax.jms.Message) - */ - public Object extractPayloadFromJMSMessage(Message msg) { - try { - if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) { - throw new ServiceRuntimeException("remote service exception, see nested exception",(Throwable)((ObjectMessage)msg).getObject()); - } - } catch (JMSException e) { - throw new JMSBindingException(e); - } - return extractPayload(msg); - } - - public Message createFaultMessage(Session session, Throwable o) { - try { - - ObjectMessage message = session.createObjectMessage(); - message.setObject(o); - message.setBooleanProperty(JMSBindingConstants.FAULT_PROPERTY, true); - return message; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - - protected abstract Object[] extractPayload(Message msg); - - protected abstract Message createJMSMessage(Session session, Object o); - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java deleted file mode 100644 index e5d14dd42f..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java +++ /dev/null @@ -1,273 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.lang.reflect.InvocationTargetException; - -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.naming.NamingException; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.DataExchangeSemantics; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Interceptor for the JMS binding. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingInvoker implements Invoker, DataExchangeSemantics { - - protected Operation operation; - protected String operationName; - - protected JMSBinding jmsBinding; - protected JMSResourceFactory jmsResourceFactory; - protected JMSMessageProcessor requestMessageProcessor; - protected JMSMessageProcessor responseMessageProcessor; - protected Destination requestDest; - protected Destination replyDest; - - public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory) { - - this.operation = operation; - operationName = operation.getName(); - - this.jmsBinding = jmsBinding; - this.jmsResourceFactory = jmsResourceFactory; - requestMessageProcessor = jmsBinding.getRequestMessageProcessor(); - responseMessageProcessor = jmsBinding.getResponseMessageProcessor(); - try { - requestDest = lookupDestination(); - replyDest = lookupResponseDestination(); - } catch (NamingException e) { - throw new JMSBindingException(e); - } - - } - - /** - * Looks up the Destination Queue for the JMS Binding - * - * @return The Destination Queue - * @throws NamingException Failed to lookup Destination Queue - * @throws JMSBindingException Failed to lookup Destination Queue - * @see #lookupDestinationQueue(boolean) - */ - private Destination lookupDestination() throws NamingException, JMSBindingException { - return lookupDestinationQueue(false); - } - - /** - * Looks up the Destination Response Queue for the JMS Binding - * - * @return The Destination Response Queue - * @throws NamingException Failed to lookup Destination Response Queue - * @throws JMSBindingException Failed to lookup Destination Response Queue - * @see #lookupDestinationQueue(boolean) - */ - private Destination lookupResponseDestination() throws NamingException, JMSBindingException { - return lookupDestinationQueue(true); - } - - /** - * Looks up the Destination Queue for the JMS Binding. - *

- * What happens in the look up will depend on the create mode specified for the JMS Binding: - *

    - *
  • always - the JMS queue is always created. It is an error if the queue already exists - *
  • ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists - *
  • never - the JMS queue is never created. It is an error if the queue does not exist - *
- * See the SCA JMS Binding specification for more information. - *

- * - * @param isReponseQueue true if we are creating a response queue. false if we are - * creating a request queue - * @return The Destination queue. - * @throws NamingException Failed to lookup JMS queue - * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that the JMS queue's current - * existence/non-existence is not compatible with the create mode specified on the binding - */ - private Destination lookupDestinationQueue(boolean isReponseQueue) throws NamingException, JMSBindingException { - String queueName; - String queueType; - String qCreateMode; - if (isReponseQueue) { - queueName = jmsBinding.getResponseDestinationName(); - queueType = "JMS Response Destination "; - qCreateMode = jmsBinding.getResponseDestinationCreate(); - if (JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME.equals(queueName)) { - return null; - } - } else { - queueName = jmsBinding.getDestinationName(); - queueType = "JMS Destination "; - qCreateMode = jmsBinding.getDestinationCreate(); - } - - Destination dest = jmsResourceFactory.lookupDestination(queueName); - - if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) { - // In this mode, the queue must not already exist as we are creating it - if (dest != null) { - throw new JMSBindingException(queueType + queueName - + " already exists but has create mode of \"" - + qCreateMode - + "\" while registering binding " - + jmsBinding.getName() - + " invoker"); - } - // Create the queue - dest = jmsResourceFactory.createDestination(queueName); - - } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) { - // In this mode, the queue may nor may not exist. It will be created if it does not exist - if (dest == null) { - dest = jmsResourceFactory.createDestination(queueName); - } - - } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) { - // In this mode, the queue must have already been created. - if (dest == null) { - throw new JMSBindingException(queueType + queueName - + " not found but create mode of \"" - + qCreateMode - + "\" while registering binding " - + jmsBinding.getName() - + " invoker"); - } - } - - // Make sure we ended up with a queue - if (dest == null) { - throw new JMSBindingException(queueType + queueName - + " not found with create mode of \"" - + qCreateMode - + "\" while registering binding " - + jmsBinding.getName() - + " invoker"); - } - - return dest; - } - - public org.apache.tuscany.sca.invocation.Message invoke(org.apache.tuscany.sca.invocation.Message msg) { - try { - Object resp = invokeTarget((Object[])msg.getBody(), (short)0); - msg.setBody(resp); - } catch (InvocationTargetException e) { - msg.setFaultBody(e.getCause()); - } catch (ServiceRuntimeException e) { - if (e.getCause() instanceof InvocationTargetException) { - if ((e.getCause().getCause() instanceof RuntimeException)) { - msg.setFaultBody(e.getCause()); - } else { - msg.setFaultBody(e.getCause().getCause()); - } - } else { - msg.setFaultBody(e); - } - } catch (Throwable e) { - msg.setFaultBody(e); - } - return msg; - } - - public Object invokeTarget(Object payload, final short sequence) throws InvocationTargetException { - try { - Session session = jmsResourceFactory.createSession(); - try { - - Destination replyToDest; - if (operation.isNonBlocking()) { - replyToDest = null; - } else { - replyToDest = (replyDest != null) ? replyDest : session.createTemporaryQueue(); - } - - Message requestMsg = sendRequest((Object[])payload, session, replyToDest); - if (replyToDest == null) { - return null; - } else { - Message replyMsg = receiveReply(session, replyToDest, requestMsg.getJMSMessageID()); - return ((Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg))[0]; - } - - } finally { - session.close(); - } - } catch (JMSException e) { - throw new InvocationTargetException(e); - } catch (NamingException e) { - throw new InvocationTargetException(e); - } - } - - protected Message sendRequest(Object payload, Session session, Destination replyToDest) throws JMSException { - - Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, payload); - - requestMsg.setJMSDeliveryMode(jmsBinding.getDeliveryMode()); - requestMsg.setJMSPriority(jmsBinding.getPriority()); - - requestMessageProcessor.setOperationName(operationName, requestMsg); - requestMsg.setJMSReplyTo(replyToDest); - - MessageProducer producer = session.createProducer(requestDest); - try { - producer.send(requestMsg); - } finally { - producer.close(); - } - return requestMsg; - } - - protected Message receiveReply(Session session, Destination replyToDest, String requestMsgId) throws JMSException, - NamingException { - String msgSelector = "JMSCorrelationID = '" + requestMsgId + "'"; - MessageConsumer consumer = session.createConsumer(replyToDest, msgSelector); - Message replyMsg; - try { - jmsResourceFactory.startConnection(); - replyMsg = consumer.receive(jmsBinding.getTimeToLive()); - } finally { - consumer.close(); - } - if (replyMsg == null) { - throw new JMSBindingException("No reply message received on " + replyToDest + " for message id " + requestMsgId); - } - return replyMsg; - } - - public boolean allowsPassByReference() { - // JMS always pass by value - return true; - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java deleted file mode 100644 index 61c4ec65fc..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.naming.NamingException; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - -/** - * Listener for the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingListener implements MessageListener { - - private static final Logger logger = Logger.getLogger(JMSBindingListener.class.getName()); - - private static final String ON_MESSAGE_METHOD_NAME = "onMessage"; - private JMSBinding jmsBinding; - private JMSResourceFactory jmsResourceFactory; - private RuntimeComponentService service; - private JMSMessageProcessor requestMessageProcessor; - private JMSMessageProcessor responseMessageProcessor; - private String correlationScheme; - - public JMSBindingListener(JMSBinding jmsBinding, - JMSResourceFactory jmsResourceFactory, - RuntimeComponentService service) throws NamingException { - this.jmsBinding = jmsBinding; - this.jmsResourceFactory = jmsResourceFactory; - this.service = service; - requestMessageProcessor = jmsBinding.getRequestMessageProcessor(); - responseMessageProcessor = jmsBinding.getResponseMessageProcessor(); - correlationScheme = jmsBinding.getCorrelationScheme(); - } - - public void onMessage(Message requestJMSMsg) { - logger.log(Level.FINE, "JMS service '" + service.getName() + "' received message " + requestJMSMsg); - try { - Object responsePayload = invokeService(requestJMSMsg); - sendReply(requestJMSMsg, responsePayload, false); - } catch (Throwable e) { - logger.log(Level.SEVERE, "Exception invoking service '" + service.getName(), e); - sendReply(requestJMSMsg, e, true); - } - } - - /** - * Turn the JMS message back into a Tuscany message and invoke the target component - * - * @param requestJMSMsg - * @return - * @throws JMSException - * @throws InvocationTargetException - */ - protected Object invokeService(Message requestJMSMsg) throws JMSException, InvocationTargetException { - - String operationName = requestMessageProcessor.getOperationName(requestJMSMsg); - Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(requestJMSMsg); - - List opList = service.getInterfaceContract().getInterface().getOperations(); - - Operation operation = null; - - if (opList.size() == 1) { - // SCA JMS Binding Specification - Rule 1.5.1 line 203 - operation = opList.get(0); - } else if (operationName != null) { - // SCA JMS Binding Specification - Rule 1.5.1 line 205 - for (Operation op : opList) { - if (op.getName().equals(operationName)) { - operation = op; - break; - } - } - } else { - // SCA JMS Binding Specification - Rule 1.5.1 line 207 - for (Operation op : opList) { - if (op.getName().equals(ON_MESSAGE_METHOD_NAME)) { - operation = op; - break; - } - } - } - - if (operation != null) { - return service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload); - } else { - throw new JMSBindingException("Can't find operation " + (operationName != null ? operationName - : ON_MESSAGE_METHOD_NAME)); - } - - } - - protected void sendReply(Message requestJMSMsg, Object responsePayload, boolean isFault) { - try { - - if (requestJMSMsg.getJMSReplyTo() == null) { - // assume no reply is expected - if (responsePayload != null) { - logger.log(Level.FINE, "JMS service '" + service.getName() + "' dropped response as request has no replyTo"); - } - return; - } - - Session session = jmsResourceFactory.createSession(); - Message replyJMSMsg; - if (isFault) { - replyJMSMsg = responseMessageProcessor.createFaultMessage(session, (Throwable)responsePayload); - } else { - replyJMSMsg = responseMessageProcessor.insertPayloadIntoJMSMessage(session, responsePayload); - } - - replyJMSMsg.setJMSDeliveryMode(requestJMSMsg.getJMSDeliveryMode()); - replyJMSMsg.setJMSPriority(requestJMSMsg.getJMSPriority()); - - if (correlationScheme == null || JMSBindingConstants.CORRELATE_MSG_ID.equalsIgnoreCase(correlationScheme)) { - replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSMessageID()); - } else if (JMSBindingConstants.CORRELATE_CORRELATION_ID.equalsIgnoreCase(correlationScheme)) { - replyJMSMsg.setJMSCorrelationID(requestJMSMsg.getJMSCorrelationID()); - } - - Destination destination = requestJMSMsg.getJMSReplyTo(); - MessageProducer producer = session.createProducer(destination); - - producer.send(replyJMSMsg); - - producer.close(); - session.close(); - - } catch (JMSException e) { - throw new JMSBindingException(e); - } catch (NamingException e) { - throw new JMSBindingException(e); - } - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java deleted file mode 100644 index 57fc0e1230..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.work.WorkScheduler; - -/** - * A factory from creating the JMS binding provider. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingProviderFactory implements BindingProviderFactory { - - private WorkScheduler workScheduler; - - public JMSBindingProviderFactory(ExtensionPointRegistry extensionPoints) { - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - workScheduler = utilities.getUtility(WorkScheduler.class); - } - - public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - JMSBinding binding) { - return new JMSBindingReferenceBindingProvider(component, reference, binding); - } - - public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, - RuntimeComponentService service, - JMSBinding binding) { - return new JMSBindingServiceBindingProvider(component, service, binding, workScheduler); - } - - public Class getModelType() { - return JMSBinding.class; - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java deleted file mode 100644 index 4920e92ae5..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.util.ArrayList; -import java.util.List; - -import javax.jms.JMSException; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; - -/** - * Implementation of the JMS reference binding provider. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvider { - - private RuntimeComponentReference reference; - private JMSBinding jmsBinding; - private List jmsBindingInvokers = new ArrayList(); - private JMSResourceFactory jmsResourceFactory; - - public JMSBindingReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - JMSBinding binding) { - this.reference = reference; - this.jmsBinding = binding; - jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL()); - - if (XMLTextMessageProcessor.class.isAssignableFrom(jmsBinding.getRequestMessageProcessor().getClass())) { - setXMLDataBinding(reference); - } - - } - - protected void setXMLDataBinding(RuntimeComponentReference reference) { - try { - InterfaceContract ic = (InterfaceContract)reference.getInterfaceContract().clone(); - - Interface ii = (Interface)ic.getInterface().clone(); - ii.resetDataBinding("org.apache.axiom.om.OMElement"); - ic.setInterface(ii); - reference.setInterfaceContract(ic); - - } catch (CloneNotSupportedException e) { - throw new RuntimeException(e); - } - } - - public Invoker createInvoker(Operation operation) { - - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { - throw new JMSBindingException("No destination specified for reference " + reference.getName()); - } - - /* The following doesn't work as I can't get to the - * target list on the composite reference - // if the default destination queue name is set - // set the destination queue name to the wired service name - // so that any wires can be assured a unique endpoint. - - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)){ - // get the name of the target service - List targets = reference.getTargets(); - - if (targets.size() < 1){ - throw new JMSBindingException("No target specified for reference " + - reference.getName() + - " so destination queue name can't be determined"); - } - - if (targets.size() > 1){ - throw new JMSBindingException("More than one target specified for reference " + - reference.getName() + - " so destination queue name can't be determined"); - } - - ComponentService service = targets.get(0); - jmsBinding.setDestinationName(service.getName()); - } - - - // if the default response queue name is set - // set the response queue to the names of this - // reference - if (jmsBinding.getResponseDestinationName().equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME)){ - jmsBinding.setResponseDestinationName(reference.getName()); - } - */ - JMSBindingInvoker invoker = new JMSBindingInvoker(jmsBinding, operation, jmsResourceFactory); - jmsBindingInvokers.add(invoker); - return invoker; - } - - public boolean supportsOneWayInvocation() { - return true; - } - - public InterfaceContract getBindingInterfaceContract() { - return reference.getInterfaceContract(); - } - - public void start() { - - } - - public void stop() { - try { - jmsResourceFactory.closeConnection(); - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java deleted file mode 100644 index 15a4d0ada2..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Session; -import javax.naming.NamingException; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.work.WorkScheduler; - -/** - * Implementation of the JMS service binding provider. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingServiceBindingProvider implements ServiceBindingProvider { - private static final Logger logger = Logger.getLogger(JMSBindingServiceBindingProvider.class.getName()); - - private RuntimeComponentService service; - private JMSBinding jmsBinding; - private JMSResourceFactory jmsResourceFactory; - private MessageConsumer consumer; - private WorkScheduler workScheduler; - private boolean running; - - public JMSBindingServiceBindingProvider(RuntimeComponent component, - RuntimeComponentService service, - JMSBinding binding, - WorkScheduler workScheduler) { - this.service = service; - this.jmsBinding = binding; - this.workScheduler = workScheduler; - - jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL()); - - if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) { - // use the SCA service name as the default destination name - jmsBinding.setDestinationName(service.getName()); - } - - if (XMLTextMessageProcessor.class.isAssignableFrom(jmsBinding.getRequestMessageProcessor().getClass())) { - setXMLDataBinding(service); - } - - } - - protected void setXMLDataBinding(RuntimeComponentService service) { - if (service.getInterfaceContract() != null) { - try { - InterfaceContract ic = (InterfaceContract)service.getInterfaceContract().clone(); - - Interface ii = (Interface)ic.getInterface().clone(); - ii.resetDataBinding("org.apache.axiom.om.OMElement"); - ic.setInterface(ii); - service.setInterfaceContract(ic); - - } catch (CloneNotSupportedException e) { - throw new RuntimeException(e); - } - } - } - - public InterfaceContract getBindingInterfaceContract() { - return service.getInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return true; - } - - public void start() { - this.running = true; - - try { - registerListerner(); - } catch (Exception e) { - throw new JMSBindingException("Error starting JMSServiceBinding", e); - } - } - - public void stop() { - this.running = false; - try { - consumer.close(); - jmsResourceFactory.closeConnection(); - } catch (Exception e) { - throw new JMSBindingException("Error stopping JMSServiceBinding", e); - } - } - - private void registerListerner() throws NamingException, JMSException { - - Session session = jmsResourceFactory.createSession(); - Destination destination = lookupDestinationQueue(); - - consumer = session.createConsumer(destination); - - final JMSBindingListener listener = new JMSBindingListener(jmsBinding, jmsResourceFactory, service); - try { - - consumer.setMessageListener(listener); - jmsResourceFactory.startConnection(); - - } catch (javax.jms.IllegalStateException e) { - - // setMessageListener not allowed in JEE container so use Tuscany threads - - jmsResourceFactory.startConnection(); - workScheduler.scheduleWork(new Runnable() { - public void run() { - try { - while (running) { - final Message msg = consumer.receive(); - workScheduler.scheduleWork(new Runnable() { - public void run() { - try { - listener.onMessage(msg); - } catch (Exception e) { - e.printStackTrace(); - } - }}); - } - } catch (Exception e) { - e.printStackTrace(); - } - }}); - } - logger.log(Level.INFO, "JMS service '" + service.getName() + "' listening on destination " + jmsBinding.getDestinationName()); - } - - /** - * Looks up the Destination Queue for the JMS Binding. - *

- * What happens in the look up will depend on the create mode specified for the JMS Binding: - *

    - *
  • always - the JMS queue is always created. It is an error if the queue already exists - *
  • ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists - *
  • never - the JMS queue is never created. It is an error if the queue does not exist - *
- * See the SCA JMS Binding specification for more information. - *

- * - * @return The Destination queue. - * @throws NamingException Failed to lookup JMS queue - * @throws JMSBindingException Failed to lookup JMS Queue. Probable cause is that the JMS queue's current - * existence/non-existence is not compatible with the create mode specified on the binding - */ - private Destination lookupDestinationQueue() throws NamingException, JMSBindingException { - Destination destination = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName()); - - String qCreateMode = jmsBinding.getDestinationCreate(); - if (qCreateMode.equals(JMSBindingConstants.CREATE_ALWAYS)) { - // In this mode, the queue must not already exist as we are creating it - if (destination != null) { - throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName() - + " already exists but has create mode of \"" - + qCreateMode - + "\" while registering service " - + service.getName() - + " listener"); - } - - // Create the queue - destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName()); - - } else if (qCreateMode.equals(JMSBindingConstants.CREATE_IF_NOT_EXIST)) { - // In this mode, the queue may nor may not exist. It will be created if it does not exist - if (destination == null) { - destination = jmsResourceFactory.createDestination(jmsBinding.getDestinationName()); - } - - } else if (qCreateMode.equals(JMSBindingConstants.CREATE_NEVER)) { - // In this mode, the queue must have already been created. - if (destination == null) { - throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName() - + " not found but create mode of \"" - + qCreateMode - + "\" while registering service " - + service.getName() - + " listener"); - } - } - - // Make sure we ended up with a queue - if (destination == null) { - throw new JMSBindingException("JMS Destination " + jmsBinding.getDestinationName() - + " not found with create mode of \"" - + qCreateMode - + "\" while registering service " - + service.getName() - + " listener"); - } - - return destination; - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java deleted file mode 100644 index 733cebacac..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import javax.jms.Message; -import javax.jms.Session; - -/** - * Interface for a component that does operation selection and message payload processing - * - * @version $Rev$ $Date$ - */ -public interface JMSMessageProcessor { - - /** - * Get the operation name from a JMS Message - */ - String getOperationName(Message message); - - /** - * Set the operation name on a JMS Message - */ - void setOperationName(String operationName, Message message); - - /** - * Extracts the payload from a JMS Message - */ - Object extractPayloadFromJMSMessage(Message msg); - - /** - * Create a JMS Message containing the payload - */ - Message insertPayloadIntoJMSMessage(Session session, Object payload); - - /** - * Create a JMS Message for reporting an exception - */ - Message createFaultMessage(Session session, Throwable responsePayload); -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java deleted file mode 100644 index 9b5e8e64b9..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.util.Properties; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Session; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; - -/** - * Abstracts away any JMS provide specific feature from the JMS binding - * - * @version $Rev$ $Date$ - */ -public class JMSResourceFactory { - - private String initialContextFactoryName; - private String connectionFactoryName = "ConnectionFactory"; - private String jndiURL; - - private Connection connection; - private Context context; - private boolean isConnectionStarted; - - public JMSResourceFactory(String connectionFactoryName, String initialContextFactoryName, String jndiURL) { - if (connectionFactoryName != null && connectionFactoryName.trim().length() > 0) { - this.connectionFactoryName = connectionFactoryName.trim(); - } - if (initialContextFactoryName != null && initialContextFactoryName.trim().length() > 0) { - this.initialContextFactoryName = initialContextFactoryName.trim(); - } - if (jndiURL != null) { - this.jndiURL = jndiURL.trim(); - } - } - - /* - * This is a simple implementation where a connection is created per binding Ideally the resource factory should be - * able to leverage the host environment to provide connection pooling if it can. E.g. if Tuscany is running inside - * an AppServer Then we could leverage the JMS resources it provides - * - * @see org.apache.tuscany.binding.jms.JMSResourceFactory#getConnection() - */ - public Connection getConnection() throws NamingException, JMSException { - if (connection == null) { - createConnection(); - } - return connection; - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession() - */ - public Session createSession() throws JMSException, NamingException { - return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE); - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection() - */ - public void startConnection() throws JMSException, NamingException { - if (!isConnectionStarted) { - getConnection().start(); - isConnectionStarted = true; - } - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection() - */ - public void closeConnection() throws JMSException { - if (connection != null) { - connection.close(); - } - } - - private void createConnection() throws NamingException, JMSException { - ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName); - if (connectionFactory == null) { - throw new JMSBindingException("connection factory not found: " + connectionFactoryName); - } - connection = connectionFactory.createConnection(); - } - - private synchronized Context getInitialContext() throws NamingException { - if (context == null) { - Properties props = new Properties(); - - if (initialContextFactoryName != null) { - props.setProperty(Context.INITIAL_CONTEXT_FACTORY, initialContextFactoryName); - } - if (jndiURL != null) { - props.setProperty(Context.PROVIDER_URL, jndiURL); - } - - initJREEnvironment(props); - - context = new InitialContext(props); - } - return context; - } - - /** - * If using the WAS JMS Client with a non-IBM JRE then an additional - * environment property needs to be set to initialize the ORB correctly. - * See: http://www-1.ibm.com/support/docview.wss?uid=swg24012804 - */ - private void initJREEnvironment(Properties props) { - if ("com.ibm.websphere.naming.WsnInitialContextFactory".equals(props.get(Context.INITIAL_CONTEXT_FACTORY))) { - String vendor = System.getProperty("java.vendor"); - if (vendor == null || !vendor.contains("IBM")) { - props.setProperty("com.ibm.CORBA.ORBInit","com.ibm.ws.sib.client.ORB"); - } - } - } - - public Destination lookupDestination(String jndiName) throws NamingException { - return (Destination)jndiLookUp(jndiName); - } - - /** - * You can create a destination in ActiveMQ (and have it appear in JNDI) by putting "dynamicQueues/" in front of the - * queue name being looked up - */ - public Destination createDestination(String jndiName) throws NamingException { - return lookupDestination("dynamicQueues/" + jndiName); - } - - protected Object jndiLookUp(String name) { - Object o = null; - try { - o = getInitialContext().lookup("java:comp/env/" + name); - } catch (NamingException ex) { - // ignore - } - if (o == null) { - try { - o = getInitialContext().lookup(name); - } catch (NamingException ex) { - // ignore - } - } - return o; - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java deleted file mode 100644 index e63c1ec19b..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.io.Serializable; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.Session; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; - -/** - * MessageProcessor for sending/receiving Serializable objects with - * the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public class ObjectMessageProcessor extends AbstractMessageProcessor { - - public ObjectMessageProcessor(JMSBinding jmsBinding) { - super(jmsBinding); - } - - @Override - protected Object[] extractPayload(Message msg) { - try { - - return new Object[] {((ObjectMessage)msg).getObject()}; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - - protected Message createJMSMessage(Session session, Object o) { - try { - - if (!(o instanceof Serializable)) { - throw new IllegalStateException("JMS ObjectMessage payload not Serializable: " + o); - } - - ObjectMessage message = session.createObjectMessage(); - message.setObject((Serializable)o); - return message; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java deleted file mode 100644 index cf9f6ce88b..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; -import javax.jms.TextMessage; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; - -/** - * MessageProcessor for sending/receiving javax.jms.TextMessage with - * the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public class TextMessageProcessor extends AbstractMessageProcessor { - - public TextMessageProcessor(JMSBinding jmsBinding) { - super(jmsBinding); - } - - @Override - protected Object[] extractPayload(Message msg) { - try { - - if (!(msg instanceof TextMessage)) { - throw new IllegalStateException("expecting JMS TextMessage: " + msg); - } - - return new Object[]{((TextMessage)msg).getText()}; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - - @Override - protected Message createJMSMessage(Session session, Object o) { - try { - - TextMessage message = session.createTextMessage(); - message.setText(String.valueOf(o)); - return message; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java deleted file mode 100644 index 8f4237b4bf..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import java.io.StringReader; - -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; - -/** - * MessageProcessor for sending/receiving XML javax.jms.TextMessage with - * the JMSBinding. - * - * @version $Rev$ $Date$ - */ -public class XMLTextMessageProcessor extends AbstractMessageProcessor { - - public XMLTextMessageProcessor(JMSBinding jmsBinding) { - super(jmsBinding); - } - - @Override - protected Object[] extractPayload(Message msg) { - try { - - String xml = ((TextMessage)msg).getText(); - Object[] os; - if (xml != null) { - XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml)); - StAXOMBuilder builder = new StAXOMBuilder(reader); - os = new Object[] { builder.getDocumentElement() }; - } else { - os = new Object[]{}; - } - return os; - - } catch (XMLStreamException e) { - throw new JMSBindingException(e); - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - - @Override - protected Message createJMSMessage(Session session, Object o) { - try { - - TextMessage message = session.createTextMessage(); - - if (o instanceof OMElement) { - message.setText(o.toString()); - } else if ((o instanceof Object[]) && ((Object[])o)[0] instanceof OMElement) { - message.setText(((Object[])o)[0].toString()); - } else if (o != null) { - throw new IllegalStateException("expecting OMElement payload: " + o); - } - - return message; - - } catch (JMSException e) { - throw new JMSBindingException(e); - } - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor deleted file mode 100644 index ac37a0f26b..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -# Implementation class for the artifact processor extension -org.apache.tuscany.sca.binding.jms.impl.JMSBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index dec0991984..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -# Implementation class for the binding extension -org.apache.tuscany.sca.binding.jms.provider.JMSBindingProviderFactory;model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties deleted file mode 100644 index be26a615dd..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties +++ /dev/null @@ -1,41 +0,0 @@ -# -# -# 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. -# -# -DoesntProcessOperationProperties = JMS Binding doesn't process operationProperties yet -DoesntProcessHeaders = JMS Binding doesn't process headers yet -DoesntProcessResourceAdapter = JMS Binding doesn't process resourceAdapter yet -DoesntProcessResponseConnectionFactory = JMS Binding doesn't process response connectionFactory yet -DoesntProcessResponseActivationSpec = JMS Binding doesn't process response activationSpec yet -DoesntProcessResponseDestinationType = JMS Binding doesn't process response destination type yet -DoesntProcessActivationSpec = JMS Binding doesn't process activationSpec yet -DoesntProcessDestinationType = JMS Binding doesn't process destination type yet -MissingConnectionFactoryName = Missing ConnectionFactory Name -MissingResponseConnectionFactory = Missing response connectionFactory name -InvalidResponseDestinationType = Invalid response destination type: {0} -InvalidDestinationType = Invalid destination type: {0} -MissingActivationSpecName = Missing ActivationSpec Name -MissingResponseActivationSpec = Missing response ActivationSpec name -UnknownTokenInURI = Unknown token {0} in uri: {1} -MustStartWithSchema = URI must start with the scheme 'jms:' for uri: {0} -InvalidCorrelationScheme = Invalid correlationScheme: {0} -UnexpectedElement = Incomplete binding.jms definition found unexpected element: {0} -UnexpectedResponseElement = Incomplete binding.jms/response definition found unexpected element: {0} - - diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index fb80362457..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - * - * @version $Rev$ $Date$ - */ -@Service(HelloWorldService.class) -public class HelloWorldClientImpl implements HelloWorldService { - - private HelloWorldService serviceA; - - @Reference - public void setServiceA(HelloWorldService service) { - this.serviceA = service; - } - - public String sayHello(String name) { - return serviceA.sayHello(name); - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 515da3144a..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms; - -import org.osoa.sca.annotations.Remotable; - -/** - * Interface for the HelloWorld Service. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloWorldService { - String sayHello(String name); -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index a8808c1bd1..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms; - -/** - * Implementation of the HelloWorldService. - * - * @version $Rev$ $Date$ - */ -public class HelloWorldServiceImpl implements HelloWorldService { - - public String sayHello(String name) { - return "jmsHello " + name; - } - -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java deleted file mode 100644 index b27795ab09..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms; - -import java.util.ArrayList; -import java.util.List; - -import javax.jms.TextMessage; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.provider.JMSBindingListener; -import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.interfacedef.impl.OperationImpl; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.easymock.EasyMock; -import org.junit.Test; - -/** - * This unit test is used to ensure that a JMS Message delivered to a Component will select the correct operation based - * on the details in section 1.5 of the JMS Binding specification. - * - * @version $Rev$ $Date$ - */ -public class OperationSelectionTestCaseFIXME { - /** - * This test attempts to invoke a Service with a Single method where scaOperationName is not specified in the JMS - * Message - *

- * Expected behaviour is that the single method will be invoked as scaOperationName is ignored - * - * @throws Exception Failed - */ - @Test - public void testServiceWithOnlyOneOperationScaOperationNameNotSpecified() throws Exception { - // Create the operation we should match - final Operation expectedOperation = newOperation("myOperation"); - - // Create the list of operations for the Service - final List operations = new ArrayList(); - operations.add(expectedOperation); - - // The name of the Operation in the JMS Message - not specified - final String scaOperationName = null; - - // Do the test - doTestJMSBinding(expectedOperation, operations, scaOperationName); - } - - /** - * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message matches the - * method name on the Service - *

- * Expected behaviour is that the single method will be invoked as scaOperationName is ignored - * - * @throws Exception Failed - */ - @Test - public void testServiceWithOnlyOneOperationScaOperationNameMatches() throws Exception { - // Create the operation we should match - final Operation expectedOperation = newOperation("myOperation"); - - // Create the list of operations for the Service - final List operations = new ArrayList(); - operations.add(expectedOperation); - - // The name of the Operation in the JMS Message - matches operation name - final String scaOperationName = expectedOperation.getName(); - - // Do the test - doTestJMSBinding(expectedOperation, operations, scaOperationName); - } - - /** - * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message is - * different the method name on the Service - *

- * Expected behaviour is that the single method will be invoked as scaOperationName is ignored - * - * @throws Exception Failed - */ - @Test - public void testServiceWithOnlyOneOperationScaOperationNameDifferent() throws Exception { - // Create the operation we should match - final Operation expectedOperation = newOperation("myOperation"); - - // Create the list of operations for the Service - final List operations = new ArrayList(); - operations.add(expectedOperation); - - // The name of the Operation in the JMS Message - different to operation name - final String scaOperationName = "Does Not Match Opeation Name"; - - // Do the test - doTestJMSBinding(expectedOperation, operations, scaOperationName); - } - - /** - * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS - * Message matches an operation name - *

- * Expected behaviour is that the named method will be invoked. - * - * @throws Exception Failed - */ - @Test - public void testServiceWithMultipleOperationsScaOperationNameSpecified() throws Exception { - // Create the list of operations for the Service - final List operations = new ArrayList(); - for (int i = 0; i < 5; i++) { - operations.add(newOperation("operation" + i)); - } - - // Now try and invoke each operation - for (Operation expectedOperation : operations) { - // The name of the Operation in the JMS Message - final String scaOperationName = expectedOperation.getName(); - - // Do the test - doTestJMSBinding(expectedOperation, operations, scaOperationName); - } - } - - /** - * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS - * Message is not set so we invoke the onMessage() method - *

- * Expected behaviour is that the onMessage() method should be used instead - * - * @throws Exception Failed - */ - @Test - public void testServiceWithMultipleOperationsScaOperationNotSpecified() throws Exception { - // Create the list of operations for the Service - final List operations = new ArrayList(); - for (int i = 0; i < 5; i++) { - operations.add(newOperation("operation" + i)); - } - - // Add the onMessage operation to the Service Contract - final Operation onMessageOperation = newOperation("onMessage"); - operations.add(onMessageOperation); - - // The name of the Operation in the JMS Message is not set so it will attempt - // to invoke the onMessage() method - final String scaOperationName = null; - - // Do the test - doTestJMSBinding(onMessageOperation, operations, scaOperationName); - } - - /** - * This is the test method that will attempt to unit test invoking a Service with the specified operations using a - * JMS Message with the specified scaOperationName to ensure that it invokes the expectedOperation - * - * @param expectedOperation The Operation we are expecting to be invoked over JMS - * @param operations The list of Operations supported by the Service - * @param scaOperationName The value to set scaOperationName in the JMS Message - * @throws Exception Failed - */ - private void doTestJMSBinding(Operation expectedOperation, List operations, String scaOperationName) - throws Exception { - // Create the test JMS Binding - final JMSBinding jmsBinding = new JMSBinding(); - JMSResourceFactory jmsResourceFactory = null; - - // Extra information for the method we are invoking - final String operationParams = "Hello"; - final Object operationReturnValue = "Operation Success"; - - // Mock up the Service. Basically, it is going to call: - // List opList = service.getInterfaceContract().getInterface().getOperations(); - final InterfaceContract ifaceContract = EasyMock.createStrictMock(InterfaceContract.class); - final RuntimeComponentService service = EasyMock.createStrictMock(RuntimeComponentService.class); - final Interface iface = EasyMock.createStrictMock(Interface.class); - EasyMock.expect(iface.getOperations()).andReturn(operations); - EasyMock.expect(ifaceContract.getInterface()).andReturn(iface); - EasyMock.expect(service.getInterfaceContract()).andReturn(ifaceContract); - - // Mock up getting and invoking the RuntimeWire. It is going to call: - // service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload); - final RuntimeWire runtimeWire = EasyMock.createStrictMock(RuntimeWire.class); - EasyMock.expect(service.getRuntimeWire(jmsBinding)).andReturn(runtimeWire); - EasyMock.expect(runtimeWire.invoke(expectedOperation, new Object[] {operationParams})) - .andReturn(operationReturnValue); - - // Create the JMS Binding Listener - final JMSBindingListener bindingListener = new JMSBindingListener(jmsBinding, jmsResourceFactory, service); - - // Simulate a message - final TextMessage requestJMSMsg = EasyMock.createStrictMock(TextMessage.class); - EasyMock.expect(requestJMSMsg.getStringProperty("scaOperationName")).andReturn(scaOperationName); - EasyMock.expect(requestJMSMsg.getText()).andReturn(operationParams); - EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(null); - - // Lets put all the mocks into replay mode - // EasyMock.replay(iface); - EasyMock.replay(ifaceContract); - EasyMock.replay(service); - EasyMock.replay(requestJMSMsg); - EasyMock.replay(runtimeWire); - - // Do the test - bindingListener.onMessage(requestJMSMsg); - - // Verify our Mock objects - // EasyMock.verify(iface); - // EasyMock.verify(ifaceContract); - // EasyMock.verify(service); - // EasyMock.verify(requestJMSMsg); - // EasyMock.verify(runtimeWire); - } - - private static Operation newOperation(String name) { - Operation operation = new OperationImpl(); - operation.setName(name); - return operation; - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java deleted file mode 100644 index 96f0497303..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java +++ /dev/null @@ -1,326 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.interfacedef.impl.OperationImpl; -import org.junit.Test; - -/** - * This unit test tests various combinations of the JMS Binding create modes for both request and response queues. - *

- * The SCA JMS Binding specification lists 3 create modes: - *

    - *
  • always - the JMS queue is always created. It is an error if the queue already exists - *
  • ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists - *
  • never - the JMS queue is never created. It is an error if the queue does not exist - *
- * See the SCA JMS Binding specification for more information. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingReferenceQueueCreateModeTestCaseFIXME { - - /** - * Test creating a request queue in "never" mode where the queue does not exist. We are expecting an exception - */ - @Test - public void testRequestCreateNeverQueueNotExist() { - String requestCreateMode = "never"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = false; - boolean expectingRequestException = true; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a request queue in "never" mode where the queue exists. We are expecting this to work - */ - @Test - public void testRequestCreateNeverQueueExists() { - String requestCreateMode = "never"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = true; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a request queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testRequestCreateIfNotExistQueueNotExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = false; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a request queue in "ifnotexist" mode where the queue exists. We are expecting this to work - */ - @Test - public void testRequestCreateIfNotExistQueueExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = true; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a request queue in "always" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testRequestCreateAlwaysQueueNotExist() { - String requestCreateMode = "always"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = false; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a request queue in "always" mode where the queue exists. We are expecting an exception - */ - @Test - public void testRequestCreateAlwaysQueueExists() { - String requestCreateMode = "always"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = true; - boolean expectingRequestException = true; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "never" mode where the queue does not exist. We are expecting an exception - */ - @Test - public void testResponseCreateNeverQueueNotExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "never"; - boolean preCreateQueue = false; - boolean expectingRequestException = false; - boolean expectingResponseException = true; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "never" mode where the queue exists. We are expecting this to work - */ - @Test - public void testResponseCreateNeverQueueExists() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "never"; - boolean preCreateQueue = true; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testResponseCreateIfNotExistQueueNotExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = false; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "ifnotexist" mode where the queue not exists. We are expecting this to work - */ - @Test - public void testResponseCreateIfNotExistQueueExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "ifnotexist"; - boolean preCreateQueue = true; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "always" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testResponseCreateAlwaysQueueNotExist() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "always"; - boolean preCreateQueue = false; - boolean expectingRequestException = false; - boolean expectingResponseException = false; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * Test creating a response queue in "always" mode where the queue exists. We are expecting an exception - */ - @Test - public void testResponseCreateAlwaysQueueExists() { - String requestCreateMode = "ifnotexist"; - String responseCreateMode = "always"; - boolean preCreateQueue = true; - boolean expectingRequestException = false; - boolean expectingResponseException = true; - - doTestCase(requestCreateMode, - responseCreateMode, - preCreateQueue, - expectingRequestException, - expectingResponseException); - } - - /** - * This is the main test method for the various test scenarios for the JMS Binding. - * - * @param requestCreateMode The required create mode for the request destination queue - * @param responseCreateMode The required create mode for the response destination queue - * @param preCreateQueue Whether the queue should be pre-created. - * @param expectingRequestException true if we are expecting an exception because the request queue configuration is - * invalid; false otherwise - * @param expectingResponseException true if we are expecting an exception because the request queue configuration - * is invalid; false otherwise - */ - private void doTestCase(String requestCreateMode, - String responseCreateMode, - boolean preCreateQueue, - boolean expectingRequestException, - boolean expectingResponseException) { - String requestDestinationName = "SomeRequestDestination"; - String responseDestinationName = "SomeResponseDestination"; - String jmsBindingName = "MyJMSBinding"; - - // Create a JMS Binding with the required test parameters - JMSBinding jmsBinding = new JMSBinding(); - jmsBinding.setDestinationCreate(requestCreateMode); - jmsBinding.setResponseDestinationCreate(responseCreateMode); - if (preCreateQueue) { -// jmsBinding.setJmsResourceFactoryName(new JMSResourceFactory(null, null, null)); - } else { -// jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueNotExist.class.getName()); - } - jmsBinding.setDestinationName(requestDestinationName); - jmsBinding.setResponseDestinationName(responseDestinationName); - jmsBinding.setName(jmsBindingName); - - // Create the operation - Operation operation = new OperationImpl(); - operation.setName("OperationName"); - - // Try and create the JMS Binding Invoker for the JMS Binding - try { - new JMSBindingInvoker(jmsBinding, operation, null); - - // Check whether we were expecting an exception - if (expectingRequestException || expectingResponseException) { - // We were expecting an exception - Assert.fail("This binding should have failed as it is invalid"); - } - } catch (JMSBindingException ex) { - // Were we expecting an exception - if (!expectingRequestException && !expectingResponseException) { - // No we were not expecting an exception - Assert.fail("Unexpected exception of " + ex); - } - - // Validate that the expected exception has the text we expect - if (expectingRequestException) { - Assert.assertTrue(ex.getMessage().indexOf("JMS Destination") != -1); - Assert.assertTrue(ex.getMessage().indexOf(requestCreateMode) != -1); - Assert.assertTrue(ex.getMessage().indexOf(requestDestinationName) != -1); - } else if (expectingResponseException) { - Assert.assertTrue(ex.getMessage().indexOf("JMS Response Destination") != -1); - Assert.assertTrue(ex.getMessage().indexOf(responseCreateMode) != -1); - Assert.assertTrue(ex.getMessage().indexOf(responseDestinationName) != -1); - } - Assert.assertTrue(ex.getMessage().indexOf("registering binding " + jmsBindingName + " invoker") != -1); - } - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java b/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java deleted file mode 100644 index c3c18fbfbe..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * 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.tuscany.sca.binding.jms.provider; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.jms.impl.JMSBinding; -import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException; -import org.apache.tuscany.sca.core.assembly.RuntimeComponentServiceImpl; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.junit.Test; - -/** - * This method tests various combinations of the JMS Binding create modes. - *

- * The SCA JMS Binding specification lists 3 create modes: - *

    - *
  • always - the JMS queue is always created. It is an error if the queue already exists - *
  • ifnotexist - the JMS queue is created if it does not exist. It is not an error if the queue already exists - *
  • never - the JMS queue is never created. It is an error if the queue does not exist - *
- * See the SCA JMS Binding specification for more information. - * - * @version $Rev$ $Date$ - */ -public class JMSBindingServiceQueueCreateModeTestCaseFIXME { - /** - * Test creating a queue in "never" mode where the queue does not exist. We are expecting an exception - */ - @Test - public void testCreateNeverQueueNotExist() { - String createMode = "never"; - boolean preCreateQueue = false; - boolean expectingException = true; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * Test creating a queue in "never" mode where the queue exists. We are expecting this to work - */ - @Test - public void testCreateNeverQueueExist() { - String createMode = "never"; - boolean preCreateQueue = true; - boolean expectingException = false; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * Test creating a queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testCreateIfNotExistQueueNotExist() { - String createMode = "ifnotexist"; - boolean preCreateQueue = false; - boolean expectingException = false; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * Test creating a queue in "ifnotexist" mode where the queue exists. We are expecting this to work - */ - @Test - public void testCreateIfNotExistQueueExist() { - String createMode = "ifnotexist"; - boolean preCreateQueue = true; - boolean expectingException = false; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * Test creating a queue in "always" mode where the queue does not exist. We are expecting this to work - */ - @Test - public void testCreateAlwaysQueueNotExist() { - String createMode = "always"; - boolean preCreateQueue = false; - boolean expectingException = false; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * Test creating a queue in "always" mode where the queue exists. We are expecting an exception - */ - @Test - public void testCreateAlwaysQueueExist() { - String createMode = "always"; - boolean preCreateQueue = true; - boolean expectingException = true; - - doTestCase(createMode, preCreateQueue, expectingException); - } - - /** - * This is the main test method for the various test scenarios for the JMS Binding. - * - * @param createMode The required create mode for the destination queue - * @param preCreateQueue Whether the queue should be pre-created. - * @param expectingException true if test should throw an exception - */ - private void doTestCase(String createMode, boolean preCreateQueue, boolean expectingException) { - String destinationName = "SomeDestination"; - String jmsBindingName = "MyJMSBinding"; - String serviceName = "MyServiceName"; - - // Create a JMS Binding with the required test parameters - JMSBinding jmsBinding = new JMSBinding(); - jmsBinding.setDestinationCreate(createMode); -// if (preCreateQueue) { -// jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueExist.class.getName()); -// } else { -// jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueNotExist.class.getName()); -// } - jmsBinding.setDestinationName(destinationName); - jmsBinding.setName(jmsBindingName); - - RuntimeComponentService service = new RuntimeComponentServiceImpl(); - service.setName(serviceName); - - // Try and create the JMS Binding Service for the JMS Binding - try { - JMSBindingServiceBindingProvider jmsService = - new JMSBindingServiceBindingProvider(null, service, jmsBinding, null); - jmsService.start(); - - // Check whether we were expecting an exception - if (expectingException) { - // We were expecting an exception - Assert.fail("This binding should have failed as it is invalid"); - } - } catch (JMSBindingException ex) { - // Were we expecting an exception - if (!expectingException) { - ex.printStackTrace(); - // No we were not expecting an exception - Assert.fail("Unexpected exception of " + ex); - } - - // We should get a JMSBindingException - Assert.assertTrue(ex.getMessage().indexOf("Error starting JMSServiceBinding") != -1); - - // Validate that the expected chained exception exception has the text we expect - Assert.assertNotNull(ex.getCause()); - Assert.assertTrue(ex.getCause().getMessage().indexOf("JMS Destination") != -1); - Assert.assertTrue(ex.getCause().getMessage().indexOf(createMode) != -1); - Assert.assertTrue(ex.getCause().getMessage().indexOf(destinationName) != -1); - Assert - .assertTrue(ex.getCause().getMessage().indexOf("registering service " + serviceName + " listener") != -1); - } - } -} diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/client.composite b/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/client.composite deleted file mode 100644 index dcea428493..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/client.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/service.composite b/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/service.composite deleted file mode 100644 index 44b7b29610..0000000000 --- a/branches/sca-java-1.3.1/modules/binding-jms/src/test/resources/simple/service.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - -- cgit v1.2.3