Author: antelder
Date: Wed Feb 23 13:28:18 2011
New Revision: 1073733
URL: http://svn.apache.org/viewvc?rev=1073733&view=rev
Log:
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
Added:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
(with props)
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite
Removed:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/helloworld.composite
Modified:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
Added:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml?rev=1073733&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
(added)
+++
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
Wed Feb 23 13:28:18 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:sca="http://www.springframework.org/schema/sca";
+ xsi:schemaLocation="
+ 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>
+
+</beans>
\ No newline at end of file
Propchange:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite?rev=1073733&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite
(added)
+++
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/main/resources/META-INF/helloworld.composite
Wed Feb 23 13:28:18 2011
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
+ targetNamespace="http://sample";
+ name="helloworld-spring">
+
+ <component name="HelloworldComponent">
+ <implementation.spring location="helloworld-context.xml"/>
+ </component>
+
+</composite>
Modified:
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java?rev=1073733&r1=1073732&r2=1073733&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
Wed Feb 23 13:28:18 2011
@@ -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
