diff options
Diffstat (limited to 'sca-java-2.x/trunk/samples')
5 files changed, 21 insertions, 13 deletions
diff --git a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/DateServiceImpl.java index 2b3c412de3..64bdd86f7c 100644 --- a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/DateServiceImpl.java +++ b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/DateServiceImpl.java @@ -30,6 +30,7 @@ import org.oasisopen.sca.annotation.Service; public class DateServiceImpl implements DateService { public Date getDate() { + System.out.println("DateServiceImpl.getDate()"); return new Date(); } diff --git a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java index a44dcacc3a..125c333ddc 100644 --- a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java +++ b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java @@ -18,17 +18,17 @@ */
package sample;
-import org.oasisopen.sca.annotation.Reference;
public class HelloworldImpl implements Helloworld {
- @Reference(required = false)
- private DateService dateService;
+
+ public HelloworldImpl() {
+ super();
+ System.out.println("HelloworldImpl()");
+ }
public String sayHello(String name) {
- if (dateService == null) {
- return "Hello " + name;
- }
- return "[" + dateService.getDate() + "] Hello " + name;
+ System.out.println("HelloworldImpl.sayHello(" + name + ")");
+ return "Hello " + name;
}
}
diff --git a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld-context.xml index b5fba07d66..9ecd09974e 100644 --- a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld-context.xml +++ b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld-context.xml @@ -24,9 +24,7 @@ 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">
- <bean id="testBean" class="sample.HelloworldImpl">
+ <bean id="HelloworldBean" class="sample.HelloworldImpl">
</bean>
-
- <sca:reference name="dateService" type="sample.DateService"/>
</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld.composite index 0900c63a84..6d356758ae 100644 --- a/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld.composite +++ b/sca-java-2.x/trunk/samples/helloworld-spring/src/main/resources/helloworld.composite @@ -19,10 +19,14 @@ -->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://sample"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
name="helloworld">
- <component name="HelloworldComponent">
- <implementation.spring location="helloworld-context.xml"/>
+ <component name="HelloworldClientComponent">
+ <implementation.spring location="helloworld-client-context.xml"/>
+ <service name="HelloworldClientBean">
+ <tuscany:binding.jsonrpc/>
+ </service>
<reference name="dateService" target="DateServiceComponent"/>
</component>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml index e184a014ae..59f3a25696 100644 --- a/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml +++ b/sca-java-2.x/trunk/samples/webapps/helloworld-spring/pom.xml @@ -69,7 +69,12 @@ <version>4.8.1</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.6.1</version> + <scope>test</scope> + </dependency> </dependencies> <build> |