You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2006/12/20 10:26:32 UTC
svn commit: r488995 - in
/incubator/tuscany/java/sca/services/bindings/binding.jms: ./
src/main/java/org/apache/tuscany/binding/jms/
src/test/java/org/apache/tuscany/binding/jms/
src/test/resources/META-INF/sca/ src/test/resources/wsdl/
Author: antelder
Date: Wed Dec 20 01:26:30 2006
New Revision: 488995
URL: http://svn.apache.org/viewvc?view=rev&rev=488995
Log:
Add support for JMS text messages containing XML
Added:
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java (with props)
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java (with props)
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java (with props)
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl (with props)
Modified:
incubator/tuscany/java/sca/services/bindings/binding.jms/pom.xml
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/META-INF/sca/default.scdl
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/pom.xml?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/pom.xml (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/pom.xml Wed Dec 20 01:26:30 2006
@@ -49,35 +49,27 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
+ <artifactId>databinding-axiom</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
@@ -86,12 +78,6 @@
<version>1.1</version>
</dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>org.easymock</groupId>
@@ -125,6 +111,24 @@
<version>${sca.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java Wed Dec 20 01:26:30 2006
@@ -20,6 +20,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
@@ -50,16 +51,13 @@
BoundServiceDefinition<JMSBinding> serviceDefinition,
DeploymentContext deploymentContext){
- JMSBinding jmsBinding = serviceDefinition.getBinding();
+ ServiceContract serviceContract = serviceDefinition.getServiceContract();
+ if (serviceContract instanceof WSDLServiceContract) {
+ serviceContract.setDataBinding(OM_DATA_BINDING);
+ }
+
+ JMSBinding jmsBinding = serviceDefinition.getBinding();
Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
-
- ServiceContract serviceContract;
- try {
- serviceContract = (ServiceContract)serviceDefinition.getServiceContract().clone();
- } catch (CloneNotSupportedException e) {
- throw new JMSBindingRuntimeException("Couldn't clone the Service Contract",e);
- }
- serviceContract.setDataBinding(OM_DATA_BINDING);
JMSResourceFactory jmsResourceFactory;
OperationSelector opSec;
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java Wed Dec 20 01:26:30 2006
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.binding.jms;
+import java.io.Serializable;
+import java.io.StringReader;
import java.lang.reflect.Method;
import javax.jms.Destination;
@@ -25,10 +27,16 @@
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.NamingException;
+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.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Interceptor;
@@ -40,13 +48,15 @@
protected Method operationMethod;
private JMSResourceFactory jmsResourceFactory;
private OperationSelector operationSelector;
- private InboundWire inboundWire;;
+ private InboundWire inboundWire;
+ protected boolean xmlStyle;
- public JMSProxy(InboundWire inboundWire,JMSResourceFactory jmsResourceFactory,OperationSelector operationSelector) throws NamingException{
+ public JMSProxy(InboundWire inboundWire,JMSResourceFactory jmsResourceFactory,OperationSelector operationSelector, boolean xmlStyle) throws NamingException{
this.jmsResourceFactory = jmsResourceFactory;
this.operationSelector = operationSelector;
this.inboundWire = inboundWire;
+ this.xmlStyle = xmlStyle;
}
public void onMessage(Message msg){
@@ -61,7 +71,7 @@
Interceptor headInterceptor = chain.getHeadInterceptor();
org.apache.tuscany.spi.wire.Message tuscanyMsg = new MessageImpl();
- tuscanyMsg.setBody(new Object[]{((TextMessage)msg).getText()});
+ tuscanyMsg.setBody(getPayload(msg));
tuscanyMsg.setTargetInvoker(chain.getTargetInvoker());
org.apache.tuscany.spi.wire.Message tuscanyResMsg = null;
@@ -73,25 +83,66 @@
// if result is null then the method can be assumed as oneway
if (tuscanyResMsg != null && tuscanyResMsg.getBody() != null){
- sendReply(msg,operationName, (String)tuscanyResMsg.getBody());
+ sendReply(msg,operationName, fromPayload(tuscanyResMsg));
}
-
+
} catch (JMSBindingException e) {
throw new JMSBindingRuntimeException(e);
} catch (JMSException e) {
throw new JMSBindingRuntimeException(e);
} catch (NamingException e) {
throw new JMSBindingRuntimeException(e);
- }
+ } catch (Exception e) {
+ // TODO: need to not swallow these exceptions
+ e.printStackTrace();
+ throw new JMSBindingRuntimeException(e);
+ }
+
}
- private void sendReply(Message reqMsg,String operationName,String payload) throws JMSException, NamingException{
+ private Object fromPayload(org.apache.tuscany.spi.wire.Message tuscanyResMsg) {
+ if (xmlStyle) {
+ OMElement omElement = (OMElement) tuscanyResMsg.getBody();
+ omElement.build();
+ return (String)omElement.toString();
+ } else {
+ Object o = tuscanyResMsg.getBody();
+ return o;
+ }
+ }
+
+ private Object[] getPayload(Message msg) throws JMSException {
+ if (xmlStyle) {
+ try {
+ String xml = ((TextMessage)msg).getText();
+
+ XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
+ StAXOMBuilder builder = new StAXOMBuilder(reader);
+ OMElement omElement = builder.getDocumentElement();
+
+ return new Object[] {omElement};
+
+ } catch (XMLStreamException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ Object o = ((ObjectMessage)msg).getObject();
+ return new Object[] {o};
+ }
+ }
+
+ private void sendReply(Message reqMsg,String operationName,Object payload) throws JMSException, NamingException{
Session session = jmsResourceFactory.createSession();
-
- javax.jms.Message message = jmsResourceFactory.createMessage(session);
-
- ((javax.jms.TextMessage)message).setText((String)payload);
+
+ Message message;
+ if (xmlStyle) {
+ message = jmsResourceFactory.createMessage(session);
+ ((TextMessage)message).setText((String)payload);
+ } else {
+ message = jmsResourceFactory.createObjectMessage(session);
+ ((ObjectMessage)message).setObject((Serializable)payload);
+ }
Destination destination = reqMsg.getJMSReplyTo();
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java Wed Dec 20 01:26:30 2006
@@ -50,6 +50,6 @@
}
public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
- return new JMSTargetInvoker(jmsResourceFactory, jmsBinding, operation.getName(),operationSelector);
+ return new JMSTargetInvoker(jmsResourceFactory, jmsBinding, operation.getName(),operationSelector, false);
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java Wed Dec 20 01:26:30 2006
@@ -40,5 +40,7 @@
public abstract Message createMessage(Session session)
throws JMSException;
+ public abstract Message createObjectMessage(Session session) throws JMSException;
+
public abstract Destination lookupDestination(String jndiName) throws NamingException;
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java Wed Dec 20 01:26:30 2006
@@ -25,8 +25,10 @@
import javax.jms.Session;
import javax.naming.NamingException;
+import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.WireService;
/**
@@ -80,7 +82,9 @@
Destination destination = session.createQueue(jmsBinding.getDestinationName());
consumer = session.createConsumer(destination);
- consumer.setMessageListener(new JMSProxy(getInboundWire(),jmsResourceFactory,operationSelector));
+ ServiceContract sc = getBindingServiceContract();
+ boolean xmlStyle = sc instanceof WSDLServiceContract;
+ consumer.setMessageListener(new JMSProxy(getInboundWire(),jmsResourceFactory,operationSelector, xmlStyle));
jmsResourceFactory.startConnection();
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java Wed Dec 20 01:26:30 2006
@@ -19,12 +19,14 @@
package org.apache.tuscany.binding.jms;
+import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.naming.NamingException;
@@ -42,12 +44,14 @@
private String operationName;
private JMSResourceFactory jmsResourceFactory;
private OperationSelector operationSelector;
+ protected boolean xmlStyle;
- public JMSTargetInvoker(JMSResourceFactory jmsResourceFactory,JMSBinding jmsBinding, String operationName, OperationSelector operationSelector){
+ public JMSTargetInvoker(JMSResourceFactory jmsResourceFactory,JMSBinding jmsBinding, String operationName, OperationSelector operationSelector, boolean xmlStyle){
this.jmsBinding = jmsBinding;
this.jmsResourceFactory = jmsResourceFactory;
this.operationName = operationName;
this.operationSelector = operationSelector;
+ this.xmlStyle = xmlStyle;
}
/* By the time I receive the args it should have been converted to
@@ -70,7 +74,7 @@
return sendReceiveMessage(payload);
} catch (Exception e) { // catch JMS specific error
-
+ e.printStackTrace();
throw new AssertionError(e);
}
@@ -98,12 +102,18 @@
private Object sendReceiveMessage(Object payload) throws JMSException, NamingException, JMSBindingException{
Session session = jmsResourceFactory.createSession();
+
+ javax.jms.Message message;
+ if (xmlStyle) {
+ message = jmsResourceFactory.createMessage(session);
+ ((javax.jms.TextMessage)message).setText((String)payload);
+ } else {
+ message = jmsResourceFactory.createObjectMessage(session);
+ ((javax.jms.ObjectMessage)message).setObject((Serializable)payload);
+ }
- javax.jms.Message message = jmsResourceFactory.createMessage(session);
- operationSelector.setOperationName(operationName,message);
-
- ((javax.jms.TextMessage)message).setText((String)payload);
-
+ operationSelector.setOperationName(operationName,message);
+
Destination destination = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());
MessageProducer producer = session.createProducer(destination);
@@ -122,6 +132,6 @@
consumer.close();
session.close();
- return ((javax.jms.TextMessage)reply).getText();
+ return reply instanceof ObjectMessage ? ((javax.jms.ObjectMessage)reply).getObject() : ((javax.jms.TextMessage)reply).getText();
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java Wed Dec 20 01:26:30 2006
@@ -95,6 +95,13 @@
return message;
}
+ public Message createObjectMessage(Session session) throws JMSException{
+ Message message = session.createObjectMessage(); // default
+ message.setJMSDeliveryMode(jmsBinding.getDeliveryMode());
+ message.setJMSPriority(jmsBinding.getPriority());
+ return message;
+ }
+
private void createConnection() throws NamingException, JMSException {
if(context == null){
createInitialContext();
Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java?view=auto&rev=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java Wed Dec 20 01:26:30 2006
@@ -0,0 +1,26 @@
+/*
+ * 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.binding.jms;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface HelloworldService {
+ String getGreetings(String name);
+}
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java?view=auto&rev=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java Wed Dec 20 01:26:30 2006
@@ -0,0 +1,27 @@
+/*
+ * 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.binding.jms;
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/HelloworldServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java?view=auto&rev=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java Wed Dec 20 01:26:30 2006
@@ -0,0 +1,98 @@
+/*
+ * 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.binding.jms;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.activemq.broker.BrokerContainer;
+import org.activemq.broker.impl.BrokerContainerImpl;
+import org.activemq.store.vm.VMPersistenceAdapter;
+import org.apache.tuscany.test.SCATestCase;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+import org.xml.sax.SAXException;
+
+public class JMSBindingTestCase extends SCATestCase {
+
+ private IntroService introService;
+ private BrokerContainer broker;
+
+ protected static final String REQUEST_XML = "<ns:getGreetings xmlns:ns=\"http://helloworld\"><ns:name>petra</ns:name></ns:getGreetings>";
+ protected static final String REPLY_XML = "<ns1:getGreetingsResponse xmlns:ns1=\"http://helloworld\"><ns1:getGreetingsReturn>Hello petra</ns1:getGreetingsReturn></ns1:getGreetingsResponse>";
+
+ public void testJMSBinding() throws InvocationTargetException, SAXException, IOException, ParserConfigurationException {
+ String reply = introService.greet("Rajith");
+ assertEquals("Hello Rajith", reply);
+
+ // TODO: the rest should be in a seperate test method but that doesn't work as you get broker conflicts
+ JMSBinding binding = new JMSBinding();
+ binding.setInitialContextFactoryName("org.activemq.jndi.ActiveMQInitialContextFactory");
+ binding.setConnectionFactoryName("ConnectionFactory");
+ binding.setJNDIProviderURL("tcp://localhost:61616");
+ binding.setDestinationName("dynamicQueues/HelloworldServiceQueue");
+ binding.setTimeToLive(3000);
+ binding.setOperationSelectorPropertyName("scaOperationName");
+ JMSTargetInvoker invoker = new JMSTargetInvoker(new SimpleJMSResourceFactory(binding), binding, "getGreetings", new DefaultOperationSelector(binding), true);
+
+ String response = (String)invoker.invokeTarget(REQUEST_XML, (short)0);
+
+ Diff diff = XMLUnit.compareXML(REPLY_XML, response);
+ assertTrue(diff.toString(), diff.similar());
+
+ }
+
+ protected void setUp() throws Exception {
+ startBroker();
+ setApplicationSCDL(IntroService.class, "META-INF/sca/default.scdl");
+ addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/jms.system.scdl"));
+ addExtension("idl.wsdl", getClass().getClassLoader().getResource("META-INF/sca/idl.wsdl.scdl"));
+ addExtension("databinding.axiom", getClass().getResource("/META-INF/sca/databinding.axiom.scdl"));
+ super.setUp();
+ CompositeContext context = CurrentCompositeContext.getContext();
+ introService = context.locateService(IntroService.class, "IntroServiceComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ broker.stop();
+ }
+
+ public static void main(String[] args) {
+ JMSBindingTestCase test = new JMSBindingTestCase();
+ try {
+ test.setUp();
+ test.testJMSBinding();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void startBroker() throws Exception {
+ broker = new BrokerContainerImpl("JMS Binding Test");
+ // configure the broker
+ broker.addConnector("tcp://localhost:61616");
+ broker.setPersistenceAdapter(new VMPersistenceAdapter());
+ broker.start();
+ }
+}
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Wed Dec 20 01:26:30 2006
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/META-INF/sca/default.scdl?view=diff&rev=488995&r1=488994&r2=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/META-INF/sca/default.scdl Wed Dec 20 01:26:30 2006
@@ -14,7 +14,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="jms.sample">
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ name="jms.sample">
<service name="GreetingJMSService">
<interface.java class="org.apache.tuscany.binding.jms.GreetingService"/>
@@ -46,5 +47,21 @@
</binding.jms>
</reference>
+ <service name="HelloworldJMSService">
+ <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"
+ wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" />
+ <binding.jms xmlns="http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT" >
+ <connection.jms destinationName="HelloworldServiceQueue"
+ connectionFactoryName="ConnectionFactory"
+ initialContextFactoryName="org.activemq.jndi.ActiveMQInitialContextFactory"
+ providerURL="tcp://localhost:61616" />
+ </binding.jms>
+ <reference>HelloworldComponent</reference>
+ </service>
+
+ <component name="HelloworldComponent">
+ <implementation.java class="org.apache.tuscany.binding.jms.HelloworldServiceImpl"/>
+ </component>
+
</composite>
Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl?view=auto&rev=488995
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl Wed Dec 20 01:26:30 2006
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ name="helloworld">
+
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <element name="getGreetings">
+ <complexType>
+ <sequence>
+ <element name="name" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="getGreetingsResponse">
+ <complexType>
+ <sequence>
+ <element name="getGreetingsReturn" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="getGreetingsCallback">
+ <complexType>
+ <sequence>
+ <element name="getGreetingsReturn" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="getGreetings1">
+ <complexType>
+ <sequence>
+ <element name="name" type="tns:NameType">
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+
+ <complexType name="NameType">
+ <sequence>
+ <element name="firstName" type="string"/>
+ <element name="lastName" type="string"/>
+ </sequence>
+ </complexType>
+
+ <element name="getGreetings1Response">
+ <complexType>
+ <sequence>
+ <element name="getGreetingsReturn" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="getGreetingsRequest">
+ <wsdl:part element="tns:getGreetings" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="getGreetingsResponse">
+ <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="getGreetingsCallback">
+ <wsdl:part element="tns:getGreetingsCallback" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="getGreetings1Request">
+ <wsdl:part element="tns:getGreetings1" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="getGreetings1Response">
+ <wsdl:part element="tns:getGreetings1Response" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:portType name="HelloWorld">
+ <wsdl:operation name="getGreetings">
+ <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+ <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="HelloWorldCallback">
+ <wsdl:operation name="getGreetingsCallback">
+ <wsdl:input message="tns:getGreetingsCallback" name="getGreetingsCallback"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getGreetings">
+ <wsdlsoap:operation soapAction=""/>
+ <wsdl:input name="getGreetingsRequest">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getGreetingsResponse">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="HelloWorldService">
+ <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+ <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-async-1.0-incubator-SNAPSHOT/services/HelloWorldWebService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/resources/wsdl/helloworld.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org