diff options
Diffstat (limited to 'sca-java-2.x/trunk/samples')
12 files changed, 305 insertions, 75 deletions
diff --git a/sca-java-2.x/trunk/samples/launcher-shell/README b/sca-java-2.x/trunk/samples/launcher-shell/README index 093138d3d5..abdf824621 100644 --- a/sca-java-2.x/trunk/samples/launcher-shell/README +++ b/sca-java-2.x/trunk/samples/launcher-shell/README @@ -1,31 +1,34 @@ -Sample Tuscany Shell
-====================
-
-This directory contains a sample shell program supporting simple commands to
-start and stop SCA composites.
-
-To build the sample shell do this:
-mvn install
-mvn dependency:copy-dependencies
-
-To run it:
-./sca
-
-at the prompt:
-start myNode mySampleContrib ../contribution-implementation-java-calculator/target/classes
-
-or:
-start myNode mySampleContrib http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar
-
-also try:
-status
-stop myNode
-bye
-
-Starting and stopping composites is pretty fast. To see that, try the following
-two scripts, which start/stop a sample composite 10 times.
-
-./sca <sca-test
-or
-./sca <sca-test-remote
-
+Sample Tuscany Shell +==================== + +This directory contains a sample shell program supporting simple commands to +start and stop SCA composites. + +To build the sample shell do this: +mvn install + +To run it: +./sca + +at the prompt: +start myNode mySampleContrib ../contribution-implementation-java-calculator/target/classes + +or: +start myNode mySampleContrib http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar + +also try: +status +stop myNode +bye + +Starting and stopping composites is pretty fast. To see that, try the following +two scripts, which start/stop a sample composite 10 times. + +./sca <scripts/test.txt +or +./sca <scripts/test-remote.txt + +The shell can also run as a Webapp. To try it install target/scashell.war in +a Web container, point your Web browser to http://localhost:8080/scashell +and try the links on that page. + diff --git a/sca-java-2.x/trunk/samples/launcher-shell/pom.xml b/sca-java-2.x/trunk/samples/launcher-shell/pom.xml index ee1e0c1137..6aadb73d6b 100644 --- a/sca-java-2.x/trunk/samples/launcher-shell/pom.xml +++ b/sca-java-2.x/trunk/samples/launcher-shell/pom.xml @@ -27,6 +27,7 @@ </parent>
<artifactId>sample-launcher-shell</artifactId>
<name>Apache Tuscany SCA Sample Launcher Shell</name>
+ <packaging>war</packaging>
<dependencies>
<dependency>
@@ -52,11 +53,17 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-ejava</artifactId>
+ <artifactId>tuscany-feature-web20</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -67,10 +74,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
-
- <plugins>
-
- </plugins>
+ <finalName>scashell</finalName>
</build>
</project>
diff --git a/sca-java-2.x/trunk/samples/launcher-shell/sca b/sca-java-2.x/trunk/samples/launcher-shell/sca index 919f2f9273..8f6cf268b3 100755 --- a/sca-java-2.x/trunk/samples/launcher-shell/sca +++ b/sca-java-2.x/trunk/samples/launcher-shell/sca @@ -15,5 +15,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations -java -classpath `find target -name "*.jar" | awk '{ printf "%s:", $1 }'` sample.Shell +java -classpath target/classes:`ls target/scashell/WEB-INF/lib/*.jar | awk '{ printf "%s:", $1}'` sample.Shell diff --git a/sca-java-2.x/trunk/samples/launcher-shell/sca-test-remote b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-remote.txt index fd7bd5766a..fd7bd5766a 100644 --- a/sca-java-2.x/trunk/samples/launcher-shell/sca-test-remote +++ b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-remote.txt diff --git a/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt new file mode 100644 index 0000000000..71f7f3f4aa --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt @@ -0,0 +1,18 @@ +# 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 + +start foo c1 http://people.apache.org/~jsdelfino/tuscany/java/test/sample-contribution-binding-ws-calculator.jar +status diff --git a/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-status.txt b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-status.txt new file mode 100644 index 0000000000..4df56e85e8 --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-status.txt @@ -0,0 +1,17 @@ +# 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 + +status diff --git a/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-stop.txt b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-stop.txt new file mode 100644 index 0000000000..c942a3087b --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-stop.txt @@ -0,0 +1,17 @@ +# 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 + +stop foo diff --git a/sca-java-2.x/trunk/samples/launcher-shell/sca-test b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test.txt index 66c760b937..66c760b937 100644 --- a/sca-java-2.x/trunk/samples/launcher-shell/sca-test +++ b/sca-java-2.x/trunk/samples/launcher-shell/scripts/test.txt diff --git a/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/Shell.java b/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/Shell.java index 776b07e344..3ffff389c8 100644 --- a/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/Shell.java +++ b/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/Shell.java @@ -21,6 +21,8 @@ package sample; import static java.lang.System.in;
import static java.lang.System.out;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
import java.util.Arrays;
import java.util.List;
@@ -29,7 +31,9 @@ import java.util.Map; import java.util.HashMap;
import java.util.concurrent.Callable;
import java.io.BufferedReader;
+import java.io.PrintWriter;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.IOException;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
@@ -40,7 +44,7 @@ import org.apache.tuscany.sca.node.NodeFactory; * A little SCA command shell.
*/
public class Shell {
- final NodeFactory nodeFactory = NodeFactory.newInstance();
+ final NodeFactory nodeFactory;
public static class NodeInfo {
final String name;
@@ -59,83 +63,112 @@ public class Shell { return name + " " + curi + " " + cloc;
}
}
- final Map<String, NodeInfo> nodes = new HashMap<String, NodeInfo>();
+ final Map<String, NodeInfo> nodes = new HashMap<String, NodeInfo>();
final List<String> history = new ArrayList<String>();
-
- public static void main(final String[] args) throws Exception {
- new Shell().run();
- }
- boolean start(final String name, final String curi, final String cloc) {
+ public Shell(NodeFactory nf) {
+ this.nodeFactory = nf;
+ }
+
+ List<?> start(final String name, final String curi, final String cloc) {
+ if (nodes.containsKey(name))
+ return emptyList();
final Node node = nodeFactory.createNode(new Contribution(curi, cloc));
nodes.put(name, new NodeInfo(name, curi, cloc, node));
node.start();
- return true;
+ return emptyList();
}
- boolean stop(final String name) {
- nodes.get(name).node.stop();
+ List<?> stop(final String name) {
+ final NodeInfo ninfo = nodes.get(name);
+ if (ninfo == null)
+ return emptyList();
+ ninfo.node.stop();
nodes.remove(name);
- return true;
+ return emptyList();
}
- boolean status() {
- out.println(nodes.values());
- return true;
+ List<?> stop() {
+ for (NodeInfo ninfo: nodes.values())
+ ninfo.node.stop();
+ nodes.clear();
+ return emptyList();
}
- boolean history() {
- for (String l: history)
- out.println(l);
- return true;
+ List<?> restart(final String name, final String curi, final String cloc) {
+ stop(name);
+ return start(name, curi, cloc);
}
- static boolean bye() {
- return false;
+ List<?> status() {
+ return new ArrayList(nodes.values());
+ }
+
+ List<?> history() {
+ return history;
+ }
+
+ List<?> bye() {
+ return null;
}
List<String> read(final BufferedReader r) throws IOException {
- out.print("=> ");
final String l = r.readLine();
history.add(l);
- return Arrays.asList(l != null? l.split(" ") : "bye".split(" "));
+ return l != null? Arrays.asList(l.split(" ")) : singletonList("bye");
}
- Callable<Boolean> eval(final List<String> toks) {
+ Callable<List<?>> eval(final List<String> toks) {
final String op = toks.get(0);
- if (op.equals("start")) return new Callable<Boolean>() { public Boolean call() {
+ if(op.equals("start")) return new Callable<List<?>>() { public List<?> call() {
return start(toks.get(1), toks.get(2), toks.get(3));
}};
- if (op.equals("stop")) return new Callable<Boolean>() { public Boolean call() {
+ if(op.equals("stop")) return new Callable<List<?>>() { public List<?> call() {
+ if (toks.size() == 1)
+ return stop();
return stop(toks.get(1));
}};
- if (op.equals("status")) return new Callable<Boolean>() { public Boolean call() {
+ if(op.equals("restart")) return new Callable<List<?>>() { public List<?> call() {
+ return restart(toks.get(1), toks.get(2), toks.get(3));
+ }};
+ if(op.equals("status")) return new Callable<List<?>>() { public List<?> call() {
return status();
}};
- if (op.equals("history")) return new Callable<Boolean>() { public Boolean call() {
+ if(op.equals("history")) return new Callable<List<?>>() { public List<?> call() {
return history();
}};
- if (op.equals("bye")) return new Callable<Boolean>() { public Boolean call() {
+ if(op.equals("bye")) return new Callable<List<?>>() { public List<?> call() {
return bye();
}};
- return new Callable<Boolean>() { public Boolean call() {
- return true;
+ return new Callable<List<?>>() { public List<?> call() {
+ return emptyList();
}};
}
- boolean apply(final Callable<Boolean> func) {
+ List<?> apply(final Callable<List<?>> func) {
try {
return func.call();
} catch (Exception e) {
- e.printStackTrace();
- return true;
+ return singletonList(e);
}
}
- public Map<String, NodeInfo> run() throws IOException {
- final BufferedReader r = new BufferedReader(new InputStreamReader(in));
- while(apply(eval(read(r))));
+ boolean print(final List<?> l, PrintWriter w) {
+ if(l == null)
+ return false;
+ for(Object o: l)
+ w.println(o);
+ return true;
+ }
+
+ public Map<String, NodeInfo> run(final BufferedReader r, final PrintWriter w) throws IOException {
+ while(print(apply(eval(read(r))), w));
+ r.close();
return nodes;
}
+
+ public static void main(final String[] args) throws Exception {
+ new Shell(NodeFactory.newInstance()).run(new BufferedReader(new InputStreamReader(in)), new PrintWriter(out, true));
+ }
}
diff --git a/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/ShellServlet.java b/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/ShellServlet.java new file mode 100644 index 0000000000..76c5758384 --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/ShellServlet.java @@ -0,0 +1,53 @@ +/* + * 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. + */ +package sample; + +import java.io.IOException; +import java.io.Writer; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.tuscany.sca.host.webapp.WebAppHelper; + +public class ShellServlet extends HttpServlet { + static final long serialVersionUID = 1L; + + Shell shell; + + //@Override + public void init() { + shell = new Shell(WebAppHelper.getNodeFactory()); + } + + //@Override + public void destroy() { + shell.stop(); + } + + //@Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException { + shell.run(new BufferedReader(new InputStreamReader(new URL(req.getParameter("conf")).openStream())), resp.getWriter()); + } +} + diff --git a/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..661ce366c5 --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,46 @@ +<?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. +--> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> + <display-name>scashell</display-name> + + <filter> + <filter-name>tuscany</filter-name> + <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>tuscany</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>ShellServlet</servlet-name> + <servlet-class>sample.ShellServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ShellServlet</servlet-name> + <url-pattern>/run</url-pattern> + </servlet-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> +</web-app> diff --git a/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/index.html new file mode 100644 index 0000000000..d2ae91e0e9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/launcher-shell/src/main/webapp/index.html @@ -0,0 +1,40 @@ +<!-- + * 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. +--> +<html> +<head> +<title>Sample Runtime Shell</title> +</head> +<body> +<h1>It works</h1> + +<p>This Web app runs a sample Tuscany runtime shell similar to samples/launcher-shell.<br/> +To see how it works and what configuration commands are supported, just read the Shell program's <a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/src/main/java/sample/Shell.java">source code</a>.</p> + +<p>Configuration commands can be provided through a text document served from a Web location, for example:<br/> +<a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt">http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt</a></p> + +<p>To run that particular configuration script just point your Web browser to:<br/> +<a href="http://localhost:8080/scashell/run?conf=http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt">http://localhost:8080/scashell/run?conf=http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/scripts/test-start.txt</a><br/> +To run the script again and refresh the runtime shell, just refresh that page in your Web browser. +</p> + +<p>Sample configuration script samples are available in the Tuscany Subversion repository <a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/launcher-shell/scripts/">there</a>. + +</body> +</html> |