Author: lresende
Date: Tue Mar 9 03:49:29 2010
New Revision: 920646
URL: http://svn.apache.org/viewvc?rev=920646&view=rev
Log:
Porting restfull sample to 2.x
Added:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/
- copied from r901955,
tuscany/sandbox/lresende/sca-1.x/samples/expertise-restfull/
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/pom.xml
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/rest.composite
Modified: tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/pom.xml?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
--- tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/pom.xml
(original)
+++ tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/pom.xml Tue Mar
9 03:49:29 2010
@@ -18,65 +18,66 @@
* under the License.
-->
<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.7-SNAPSHOT</version>
- </parent>
- <artifactId>sample-expertise-restfull</artifactId>
- <name>Apache Tuscany SCA RESTFull Expertise Locator</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.7-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>1.7-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.7-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.7-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http-runtime</artifactId>
- <version>1.7-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.7-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ </parent>
+ <artifactId>sample-expertise-restfull</artifactId>
+ <name>Apache Tuscany SCA RESTFull Expertise Locator</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-data-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
</project>
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/launch/Launch.java
Tue Mar 9 03:49:29 2010
@@ -19,16 +19,19 @@
package org.apache.tuscany.expertise.launch;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class Launch {
public static void main(String[] args) throws Exception {
+
System.out.println("Starting ...");
- SCADomain scaDomain = SCADomain.newInstance("rest.composite");
+ Node node = NodeFactory.newInstance().createNode("rest.composite", new
String[] {"target/classes"});
+ node.start();
System.out.println("rest.composite ready for big business !!!");
System.in.read();
System.out.println("Stopping ...");
- scaDomain.close();
+ node.stop();
System.out.println();
}
}
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistry.java
Tue Mar 9 03:49:29 2010
@@ -22,7 +22,7 @@ package org.apache.tuscany.expertise.res
import java.util.List;
import org.apache.tuscany.expertise.Expert;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface ExpertRegistry {
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/ExpertRegistryImpl.java
Tue Mar 9 03:49:29 2010
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.tuscany.expertise.Expert;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Service;
@Service(ExpertRegistry.class)
public class ExpertRegistryImpl implements ExpertRegistry {
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/java/org/apache/tuscany/expertise/restfull/RestfulExpertiseLocator.java
Tue Mar 9 03:49:29 2010
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tuscany.expertise.Expert;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@Service(Servlet.class)
@Scope("COMPOSITE")
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/META-INF/sca-contribution.xml
Tue Mar 9 03:49:29 2010
@@ -17,9 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
xmlns:sample="http://sample";>
- <import.java package="org.apache.tuscany.expertise"/>
-
+
<deployable composite="sample:rest"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/rest.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/rest.composite?rev=920646&r1=901955&r2=920646&view=diff
==============================================================================
---
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/rest.composite
(original)
+++
tuscany/sandbox/lresende/sca-2.x/samples/expertise-restfull/src/main/resources/rest.composite
Tue Mar 9 03:49:29 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; xmlns:s="http://sample";
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"; name="rest"
targetNamespace="http://sample";>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
xmlns:s="http://sample"; xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1";
name="rest" targetNamespace="http://sample";>
<component name="ExpertRegistryComponent">
<implementation.java
class="org.apache.tuscany.expertise.restfull.ExpertRegistryImpl"/>
<service name="ExpertRegistry">
