Author: nash
Date: Fri Nov 23 13:57:21 2007
New Revision: 597750
URL: http://svn.apache.org/viewvc?rev=597750&view=rev
Log:
Convert callback-ws-* samples to new Node API and add 2 utility methods to
SCANodeFactory
Added:
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
Modified:
incubator/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
incubator/tuscany/java/sca/samples/pom.xml
Modified:
incubator/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
Fri Nov 23 13:57:21 2007
@@ -20,7 +20,9 @@
package org.apache.tuscany.sca.node;
import java.lang.reflect.Constructor;
+import java.net.URL;
+import org.apache.tuscany.sca.node.util.SCAContributionUtil;
import org.osoa.sca.ServiceRuntimeException;
/**
@@ -64,6 +66,21 @@
throw new ServiceRuntimeException(e);
}
}
+
+ private static SCANodeFactory singletonInstance;
+
+ /**
+ * Returns a singleton SCA node factory instance, and creates a new
+ * singleton instance if none exists.
+ *
+ * @return an SCA node factory
+ */
+ public static SCANodeFactory getInstance() {
+ if (singletonInstance == null) {
+ singletonInstance = newInstance();
+ }
+ return singletonInstance;
+ }
/**
* Creates a new SCA node.
@@ -93,5 +110,28 @@
*/
public abstract SCANode createSCANode(String nodeURI, String domainURI,
String nodeGroupURI) throws NodeException;
+ /**
+ * Convenience method to create and start a node and embedded domain
+ * that deploys a single composite within a single contribution.
+ *
+ * @param composite the composite to be deployed.
+ * @return a new SCA node.
+ */
+ public static SCANode createNodeWithComposite(String composite) throws
NodeException {
+ try {
+ final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+ final URL url =
SCAContributionUtil.findContributionFromResource(loader, composite);
+
+ final SCANode node = getInstance().createSCANode(null, null);
+ node.addContribution(url.toString(), url);
+ node.addToDomainLevelComposite(composite);
+ node.start();
+
+ return node;
+
+ } catch (Exception e) {
+ throw new NodeException(e);
+ }
+ }
}
Modified: incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml Fri Nov 23
13:57:21 2007
@@ -38,10 +38,10 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -62,6 +62,13 @@
<version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
(original)
+++
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
Fri Nov 23 13:57:21 2007
@@ -20,7 +20,8 @@
import myserver.MyService;
import myserver.MyServiceCallback;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -46,11 +47,11 @@
}
public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("myapp.composite");
- MyClient myClient = scaDomain.getService(MyClient.class,
"MyClientComponent");
+ SCANode node =
SCANodeFactory.createNodeWithComposite("myapp.composite");
+ MyClient myClient = node.getDomain().getService(MyClient.class,
"MyClientComponent");
myClient.aClientMethod();
Thread.sleep(5000); // don't exit before callback arrives
System.out.println("Closing the domain");
- scaDomain.close();
+ node.destroy();
}
}
Added:
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml?rev=597750&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
Fri Nov 23 13:57:21 2007
@@ -0,0 +1,22 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:app="http://myapp";>
+ <deployable composite="app:myapp" />
+</contribution>
Modified:
incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
Fri Nov 23 13:57:21 2007
@@ -18,7 +18,8 @@
*/
package myapp;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -28,11 +29,11 @@
*/
public class CallbackClientTestCase {
- private SCADomain scaDomain;
+ private SCANode node;
@Before
public void startServer() throws Exception {
- scaDomain = SCADomain.newInstance("callbackws.composite");
+ node = SCANodeFactory.createNodeWithComposite("callbackws.composite");
}
@Test
@@ -42,6 +43,6 @@
@After
public void stopServer() throws Exception {
- scaDomain.close();
+ node.destroy();
}
}
Modified: incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml Fri Nov 23
13:57:21 2007
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
@@ -62,6 +62,13 @@
<version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
(original)
+++
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
Fri Nov 23 13:57:21 2007
@@ -20,7 +20,8 @@
import java.io.IOException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
/**
* This server program shows how to create and start an SCA runtime that
@@ -28,9 +29,9 @@
*/
public class CallbackServer {
- public static void main(String[] args) {
+ public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("callbackws.composite");
+ SCANode node =
SCANodeFactory.createNodeWithComposite("callbackws.composite");
try {
System.out.println("Callback server started (press enter to
shutdown)");
@@ -39,7 +40,7 @@
e.printStackTrace();
}
- scaDomain.close();
+ node.destroy();
System.out.println("Callback server stopped");
}
Added:
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml?rev=597750&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
Fri Nov 23 13:57:21 2007
@@ -0,0 +1,24 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://callbackws";
+ xmlns:cbws="http://callbackws";>
+ <deployable composite="cbws:callbackws" />
+</contribution>
Modified:
incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
Fri Nov 23 13:57:21 2007
@@ -21,7 +21,8 @@
import java.io.IOException;
import java.net.Socket;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,11 +32,11 @@
*/
public class CallbackServerTestCase {
- private SCADomain scaDomain;
+ private SCANode node;
@Before
public void startServer() throws Exception {
- scaDomain = SCADomain.newInstance("callbackws.composite");
+ node = SCANodeFactory.createNodeWithComposite("callbackws.composite");
}
@Test
@@ -45,6 +46,6 @@
@After
public void stopServer() throws Exception {
- scaDomain.close();
+ node.destroy();
}
}
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?rev=597750&r1=597749&r2=597750&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Fri Nov 23 13:57:21 2007
@@ -48,7 +48,7 @@
<module>calculator-script</module>
<module>calculator-webapp</module>
<module>calculator-ws-webapp</module>
- <!--module>callback-ws-client</module-->
+ <module>callback-ws-client</module>
<module>callback-ws-service</module>
<module>chat-webapp</module>
<module>databinding-echo</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
