diff options
Diffstat (limited to '')
5 files changed, 7 insertions, 7 deletions
diff --git a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java index 1e1a0987ad..a1a6c4aae0 100644 --- a/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ b/java/sca/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java @@ -105,7 +105,7 @@ public class ExceptionsTestCase { Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
- assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());
+ assertEquals("bla", ((RuntimeException)o).getMessage());
}
@Test
@@ -151,7 +151,7 @@ public class ExceptionsTestCase { Object o = ((ObjectMessage)m).getObject();
assertTrue(o instanceof RuntimeException);
assertTrue("java.lang.RuntimeException".equals(o.getClass().getName()));
- assertEquals("java.lang.RuntimeException: bla", ((RuntimeException)o).getMessage());
+ assertEquals("bla", ((RuntimeException)o).getMessage());
}
@After
diff --git a/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java index 170e28b15d..0d897d8703 100644 --- a/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ b/java/sca/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java @@ -97,7 +97,7 @@ public class ExceptionsTestCase { service.throwUnChecked();
fail();
} catch (Exception e) {
- assertEquals("java.lang.RuntimeException: bla", e.getCause().getMessage());
+ assertEquals("bla", e.getCause().getMessage());
}
}
diff --git a/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java index c9609119c9..a2bfc0ca8a 100644 --- a/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java +++ b/java/sca/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java @@ -48,7 +48,7 @@ public class FormatJMSObjectTestCase { assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs",
helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs"));
- assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs foo java.lang.RuntimeException: bla",
+ assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs foo bla",
helloWorldService.getGreetingsDontWrapSingle("Fred", "Bloggs"));
}
diff --git a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite index af65f887c0..7e3b2b35f0 100644 --- a/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite +++ b/java/sca/itest/properties/src/main/resources/ConstructorPropertyInjection.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" name="ConstructorPropertyInjection"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" targetNamespace="http://foo" name="ConstructorPropertyInjection"> <component name="Foo1Component"> <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo1" /> diff --git a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite index 95ee1157bf..fd181bfcaa 100644 --- a/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite +++ b/java/sca/itest/properties/src/main/resources/OuterPropertyTest.composite @@ -26,7 +26,7 @@ <implementation.composite name="foo:PropertyTest" />
<property name="number">125</property>
<property name="complex" type="foo:MyComplexType">
- <foo:MyComplexValue xsi:type="foo:MyComplexType">
+ <value xsi:type="foo:MyComplexType">
<foo:a>Overriden A</foo:a>
<foo:b>Overriden B</foo:b>
<foo:c>Overriden C</foo:c>
@@ -35,7 +35,7 @@ <foo:y>Overriden Y</foo:y>
<foo:z>Overriden Z</foo:z>
</foo:x>
- </foo:MyComplexValue>
+ </value>
</property>
</component>
</composite>
|