summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/testing
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-09-13 09:45:41 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-09-13 09:45:41 +0000
commit62ceee259dc611307575b9bc216bfbf626e96b00 (patch)
tree780a0e17f92c7895d571f088ce8b29edc6a9f591 /sca-java-2.x/trunk/testing
parentfa844ef795349943842118b8a26c948d99de7ee3 (diff)
TUSCANY-3937 - Apply Michael's path (but not including the test in the build yet). Thanks Michael.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1170101 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/testing')
-rw-r--r--sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite2
-rw-r--r--sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite13
-rw-r--r--sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java1
3 files changed, 11 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index e697cedd62..3587badb5d 100644
--- a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
@@ -21,7 +21,7 @@
<component name="Foo1Component">
<implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo1" />
- <property name="bar" value="foobar" />
+ <property name="bar" value="fubar" />
</component>
<component name="Foo2Component">
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
index 93f164a1e7..104662b26e 100644
--- a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
@@ -16,10 +16,15 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" name="Iteration3Composite"
- targetNamespace="http://foo" local="true" autowire="false">
+<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:foo="http://foo"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ name="Iteration3Composite"
+ targetNamespace="http://foo"
+ local="true"
+ autowire="false">
<property name="newLocation" type="xsd:anyURI">Raleigh</property>
<property name="newYear" type="xsd:anyURI">2008</property>
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..2207543b1e 100644
--- a/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
@@ -38,6 +38,7 @@ public class ConstructorPropertyInjectionTestCase {
node.start();
} catch (Exception e) {
e.printStackTrace();
+ throw e;
}
}