Author: slaws
Date: Tue Sep 13 09:45:41 2011
New Revision: 1170101
URL: http://svn.apache.org/viewvc?rev=1170101&view=rev
Log:
TUSCANY-3937 - Apply Michael's path (but not including the test in the build
yet). Thanks Michael.
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite?rev=1170101&r1=1170100&r2=1170101&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
Tue Sep 13 09:45:41 2011
@@ -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">
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite?rev=1170101&r1=1170100&r2=1170101&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/Outer.composite
Tue Sep 13 09:45:41 2011
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java?rev=1170101&r1=1170100&r2=1170101&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
Tue Sep 13 09:45:41 2011
@@ -38,6 +38,7 @@ public class ConstructorPropertyInjectio
node.start();
} catch (Exception e) {
e.printStackTrace();
+ throw e;
}
}