Author: slaws
Date: Fri May 29 08:27:11 2009
New Revision: 779892
URL: http://svn.apache.org/viewvc?rev=779892&view=rev
Log:
TUSCANY-2967 back out the trial change to bytes format messages so that all
wire formats consistently return faults as JMS Object messages.
Modified:
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
Modified:
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java?rev=779892&r1=779891&r2=779892&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
Fri May 29 08:27:11 2009
@@ -33,7 +33,10 @@
try {
helloWorldService1.throwChecked(name.getBytes());
} catch (Exception e) {
- stringValue += " " + e.getMessage();
+ // Test to see what happens if we talk to a service
+ // that declares a checked exception through an
+ // interface that doesn't
+ stringValue += " " + e.getCause().getMessage();
}
try {
Modified:
tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java?rev=779892&r1=779891&r2=779892&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
Fri May 29 08:27:11 2009
@@ -51,11 +51,19 @@
HelloWorldReference helloWorldService =
((SCAClient)node).getService(HelloWorldReference.class,
"HelloWorldReferenceComponent");
System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ * return faults as JMSObject messages to be consistent
+ * again with other wire formats
assertEquals("Hello Fred Bloggs " +
"org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.CheckedException:
foo " +
"org.osoa.sca.ServiceRuntimeException:
java.lang.RuntimeException: bla",
helloWorldService.getGreetings("Fred Bloggs"));
-
+*/
+ assertEquals("Hello Fred Bloggs " +
+ "foo " +
+ "remote service exception, see nested exception" ,
+ helloWorldService.getGreetings("Fred Bloggs"));
+
}
@After
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java?rev=779892&r1=779891&r2=779892&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
Fri May 29 08:27:11 2009
@@ -45,13 +45,16 @@
super(jmsBinding);
}
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ * return faults as JMSObject messages to be consistent
+ * again with other wire formats
@Override
public Object extractPayloadFromJMSMessage(Message msg) {
byte [] bytes = (byte [])extractPayload(msg);
try {
if (msg.getBooleanProperty(JMSBindingConstants.FAULT_PROPERTY)) {
- return new InvocationTargetException(new
ServiceRuntimeException(bytes.toString()));
+ return new InvocationTargetException(new
ServiceRuntimeException(new String(bytes)));
} else {
return bytes;
}
@@ -59,6 +62,7 @@
throw new JMSBindingException(e);
}
}
+*/
@Override
protected Object extractPayload(Message msg) {
@@ -79,6 +83,9 @@
}
}
+/* TUSCANY-2967 - disable this change while we decide what to do and
+ * return faults as JMSObject messages to be consistent
+ * again with other wire formats
@Override
public Message createFaultMessage(Session session, Throwable o) {
try {
@@ -88,7 +95,8 @@
} catch (JMSException e) {
throw new JMSBindingException(e);
}
- }
+ }
+*/
@Override
protected Message createJMSMessage(Session session, Object o) {
