diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-23 13:28:18 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-23 13:28:18 +0000 |
| commit | 0faa97344b95221dc168e0a1c341061b7de79182 (patch) | |
| tree | 1d34502fdfa6f9b7551e60f0ca5a78e595f9ff3b /sca-java-2.x/trunk/unreleased/samples | |
| parent | 9016bc13af1401d89cc3940741b28c941cac796d (diff) | |
Updates to the spring helloworld sample, move all the config files into meta-inf and add a sca service element to the beans xml file
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1073733 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/unreleased/samples')
| -rw-r--r-- | sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml (renamed from sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld-context.xml) | 2 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite (renamed from sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld.composite) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml index 9217c0ed35..8626de64fd 100644 --- a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld-context.xml +++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml @@ -24,6 +24,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> + <sca:service name="HelloworldService" target="HelloworldBean" /> + <bean id="HelloworldBean" class="sample.HelloworldImpl"> </bean> diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite index 755fa41638..755fa41638 100644 --- a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld.composite +++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java index 76b2d734f6..1c5c085e8b 100644 --- a/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java +++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java @@ -31,7 +31,7 @@ public class HelloworldTestCase { public void testSayHello() throws NoSuchServiceException { // Run the SCA composite in a Tuscany runtime - Node node = TuscanyRuntime.runComposite("helloworld.composite", "target/classes"); + Node node = TuscanyRuntime.runComposite(null, "target/classes"); try { // Get the Helloworld service proxy |