From ebb89430400c2cb1d1c74ca18927375ff41601cc Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 5 Feb 2009 07:55:03 +0000 Subject: Move the contrib folder out of the sca trunk build as discussed on the ML git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741038 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/contrib/samples/domain-webapp/README | 310 ------------------ java/sca/contrib/samples/domain-webapp/build.xml | 296 ----------------- java/sca/contrib/samples/domain-webapp/pom.xml | 101 ------ .../src/main/java/node/DomainServer.java | 54 ---- .../main/resources/META-INF/sca-contribution.xml | 24 -- .../src/main/resources/domain.composite | 54 ---- .../src/main/resources/webroot/index.html | 354 --------------------- .../src/main/resources/webroot/node.png | Bin 689 -> 0 bytes .../src/main/resources/webroot/style.css | 176 ---------- 9 files changed, 1369 deletions(-) delete mode 100644 java/sca/contrib/samples/domain-webapp/README delete mode 100644 java/sca/contrib/samples/domain-webapp/build.xml delete mode 100644 java/sca/contrib/samples/domain-webapp/pom.xml delete mode 100644 java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java delete mode 100755 java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite delete mode 100644 java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html delete mode 100644 java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png delete mode 100644 java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css (limited to 'java/sca/contrib/samples/domain-webapp') diff --git a/java/sca/contrib/samples/domain-webapp/README b/java/sca/contrib/samples/domain-webapp/README deleted file mode 100644 index c01a0dd39a..0000000000 --- a/java/sca/contrib/samples/domain-webapp/README +++ /dev/null @@ -1,310 +0,0 @@ -Domain Webapp Sample -==================== - -Not actually a webapp just yet as webapp host need to use the new domain for it to work. -If you run the DomainServer in a debugger you will get a server that provides a registry -for servide URLs, listens for Nodes starting and stopping and provides a web page where -you can see what nodes are registered and pull up their web pages. - -Use the nodes from the calculator-distributed to register with this domain - - -========================================== -Below copied from calculator sample as a template for when this gets done - - -This sample implements a simple calculator using SCA components. It uses -exactly the same calculator application classes as the calculator sample but -runs the application distributed across three nodes. - -A node in this sample means an instance of the Tuscany SCA java runtime running -in a Java virtual machine. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - -If you just want to run it to see what happens open four command prompts and -navigate to this sample directory in each one. There is one command to be run -in each command prompt: - -ant runDomainNode -ant runNodeB -ant runNodeC -ant runNodeA - -Please run the commands in this order. - -OR if you don't have ant, on Windows use - -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.DomainNode -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA - -and on *nix do - -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.DomainNode -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA - - -The processes started on each of these command prompts can be ended by pressing -the key. - - -Sample Overview ---------------- -The sample provides a single calculator service with a default SCA (java) -binding. NodeA exercises this interface by calling add, subtract, multiply and -divide operations. - -In the case of add and subtract the runtime recognises that -it can't find these services locally and, using the remote (web services) -version of the default SCA binding contacts the add service running in NodeB -and the subtract service running in NodeC. - -On the command prompt where you started NodeA, you would see output of invoking the -calculator functions distributed over NodeB and and NodeC. On the command prompts -where you have started NodeB and NodeC, you would see log messages that indicate that -the add and substract services where called on these nodes respectively. - -The sample demonstrates that the calculator application can be distributed -across multiple nodes with no change to the application or to the SCA description -files. - - -calculator/ - src/ - main/ - java/ - calculator/ - CalculatorService.java - the first component, calls +-/* as - appropriate - AddService.java - adds two numbers - AddServiceImpl.java - SubtractService.java - subtracts one number from another - SubtractServiceImpl.java - MultiplyService.java - multiplies two numbers - MultiplyServiceImpl.java - DivideService.java - divides one number by another - DivideServiceImpl.java - node/ - CalculatorNode.java - runs up an sca application based on - configuration given on the command - line in the form - - CalculatorNode - - it looks for a directory name the same - as and loads the composites - there - - if = nodeA it calls the - +-/* operations otherwise it behaves - like a server and waits for service - requests - DomainNode.java - the node that provides the service - discovery mechanism to the distributed - domain - resources/ - domain - the SCA assembly for the service discovery - function - management/ - the SCA assembly for each nodes management - function - nodeA - the SCA assembly for nodeA's part of the - calculator application - nodeB - the SCA assembly for nodeB's part of the - calculator application - nodeC - the SCA assembly for nodeB's part of the - calculator application - test/ - java/ - calculator/ - DomainInMemoryTestCase.java - JUnit test case which runs all of the - separate ndes in a single VM for test - purposes - calculator-distributed.png - a pictorial representation of the sample - .composite files - build.xml - the Ant build file - pom.xml - the Maven build file - - -Building And Running The Sample Using Ant ------------------------------------------ -With the binary distribution the sample can be built and run using Ant as -follows - -cd calculator-distributed -ant compile -ant runDomainNode -ant runNodeB -ant runNodeC -ant runNodeA - -You should see the following output from the four separate command prompt: - -runDomainNode: - [java] log4j:WARN No appenders could be found for logger (org.apache.axiom. -om.util.StAXUtils). - [java] log4j:WARN Please initialize the log4j system properly. - [java] 23-Aug-2007 17:40:40 org.apache.tuscany.sca.http.jetty.JettyServer a -ddServletMapping - [java] INFO: Added Servlet mapping: http://localhost:8080/ServiceDiscoveryC -omponent/ServiceDiscovery - [java] Domain node started (press enter to shutdown) - [java] Registering service: [mydomain nodeB AddServiceComponent org.apache. -tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent] - [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap -ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon -ent] - [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca -ny.sca.assembly.SCABinding] - [java] Matching service url: http://localhost:8086/SubtractServiceComponent - - [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc -a.assembly.SCABinding] - [java] Matching service url: http://localhost:8085/AddServiceComponent - [java] Java Result: 1 -Terminate batch job (Y/N)? y - - - -runNodeB: - [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/ -target/classes/management/ - [java] log4j:WARN No appenders could be found for logger (org.apache.axiom. -om.util.StAXUtils). - [java] log4j:WARN Please initialize the log4j system properly. - [java] Registering service: [mydomain nodeB AddServiceComponent/ org.apache -.tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent] - [java] 23-Aug-2007 17:41:25 org.apache.tuscany.sca.http.jetty.JettyServer a -ddServletMapping - [java] INFO: Added Servlet mapping: http://localhost:8085/AddServiceCompone -nt - [java] Node started (press enter to shutdown) - [java] AddService - add 3.0 and 2.0 - - -runNodeC: - [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/ -target/classes/management/ - [java] log4j:WARN No appenders could be found for logger (org.apache.axiom. -om.util.StAXUtils). - [java] log4j:WARN Please initialize the log4j system properly. - [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap -ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon -ent] - [java] 23-Aug-2007 17:41:51 org.apache.tuscany.sca.http.jetty.JettyServer a -ddServletMapping - [java] Node started (press enter to shutdown) - [java] INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceCo -mponent - [java] SubtractService - subtract 3.0 and 2.0 -Terminate batch job (Y/N)? y - - -runNodeA: - [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/ -target/classes/management/ - [java] log4j:WARN No appenders could be found for logger (org.apache.axiom. -om.util.StAXUtils). - [java] log4j:WARN Please initialize the log4j system properly. - [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co -mpositeBuilderImpl$1 problem - [java] WARNING: [WARNING] Component reference target not found, it might be - a remote service: AddServiceComponent null - [java] - [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co -mpositeBuilderImpl$1 problem - [java] WARNING: [WARNING] Component reference target not found, it might be - a remote service: SubtractServiceComponent null - [java] - [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca -ny.sca.assembly.SCABinding] - [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc -a.assembly.SCABinding] - [java] CalculatorService - add 3.0 and 2.0 - [java] 3 + 2=5.0 - [java] CalculatorService - subtract 3.0 and 2.0 - [java] 3 - 2=1.0 - [java] CalculatorService - multiply 3.0 and 2.0 - [java] 3 * 2=6.0 - [java] CalculatorService - divide 3.0 and 2.0 - [java] 3 / 2=1.5 - - -Building And Running The Sample Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. When running from Maven the four nodes all run within -Java virtual machine. - -cd calculator-distributed -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running calculator.DomainInMemoryTestCase -Setting up distributed nodes -file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class -es/management/ -log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX -Utils). -log4j:WARN Please initialize the log4j system properly. -23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild -erImpl$1 problem -WARNING: [WARNING] Component reference target not found, it might be a remote se -rvice: AddServiceComponent null - -23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild -erImpl$1 problem -WARNING: [WARNING] Component reference target not found, it might be a remote se -rvice: SubtractServiceComponent null - -file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class -es/management/ -Registering service: [mydomain nodeB AddServiceComponent org.apache.tuscany.sca. -assembly.SCABinding http://localhost:8085/AddServiceComponent] -file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class -es/management/ -Registering service: [mydomain nodeC SubtractServiceComponent org.apache.tuscany -.sca.assembly.SCABinding http://localhost:8086/SubtractServiceComponent] -Finding service: [mydomain SubtractServiceComponent org.apache.tuscany.sca.assem -bly.SCABinding] -Matching service url: http://localhost:8086/SubtractServiceComponent -Finding service: [mydomain AddServiceComponent org.apache.tuscany.sca.assembly.S -CABinding] -Matching service url: http://localhost:8085/AddServiceComponent -23-Aug-2007 18:18:45 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap -ping -INFO: Added Servlet mapping: http://localhost:8085/AddServiceComponent -23-Aug-2007 18:18:47 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap -ping -INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceComponent -CalculatorService - add 3.0 and 2.0 -AddService - add 3.0 and 2.0 -CalculatorService - subtract 3.0 and 2.0 -SubtractService - subtract 3.0 and 2.0 -CalculatorService - multiply 3.0 and 2.0 -CalculatorService - divide 3.0 and 2.0 -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.14 sec - -Results : - -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - - -This shows that the Junit test cases have run successfully. - -Known Bug : ---------- -The processes that are running NodeB and NodeC do not seem to end on pressing the -. This will be fixed for the next release. For this release you should use -^C (Control C) to exit these processes. - - diff --git a/java/sca/contrib/samples/domain-webapp/build.xml b/java/sca/contrib/samples/domain-webapp/build.xml deleted file mode 100644 index e008e3c9f0..0000000000 --- a/java/sca/contrib/samples/domain-webapp/build.xml +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/contrib/samples/domain-webapp/pom.xml b/java/sca/contrib/samples/domain-webapp/pom.xml deleted file mode 100644 index 0b4309a244..0000000000 --- a/java/sca/contrib/samples/domain-webapp/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../pom.xml - - sample-domain-webapp - Apache Tuscany SCA Domain Webapp Sample - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-embedded - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-domain-impl - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-http - 2.0-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-resource - 2.0-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - - - ${artifactId} - - diff --git a/java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java b/java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java deleted file mode 100644 index ea3cddc01b..0000000000 --- a/java/sca/contrib/samples/domain-webapp/src/main/java/node/DomainServer.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 node; - -import java.io.IOException; - - -/** - * This server program that loads a composite to provide simple registry function. - * This server can be replaced with any registry that is appropriate but the components - * in each node that talk to the registry should be replaced also. - */ -public class DomainServer { - - public static void main(String[] args) { - try { -/* - NodeImpl node = new NodeImpl(); - node.start(); - node.getContributionManager().startContribution(DomainServer.class.getClassLoader().getResource(".")); - - try { - System.out.println("Domain server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - node.stop(); - System.out.println("Domain server stopped"); -*/ - } catch (Exception ex) { - System.out.println("Exception in domain server " + - ex.toString()); - } - } - -} diff --git a/java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100755 index fbe5880db6..0000000000 --- a/java/sca/contrib/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite b/java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite deleted file mode 100644 index dbaaebd3c7..0000000000 --- a/java/sca/contrib/samples/domain-webapp/src/main/resources/domain.composite +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html deleted file mode 100644 index 425bd73734..0000000000 --- a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/index.html +++ /dev/null @@ -1,354 +0,0 @@ - - - -Apache Tuscany Domain - - - - - - - - - - - - -

Apache Tuscany Domain

-
- -

Domain Name:

- -
- -

- -

- - - diff --git a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png deleted file mode 100644 index b3c949d224..0000000000 Binary files a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/node.png and /dev/null differ diff --git a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css b/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css deleted file mode 100644 index f5bbf23379..0000000000 --- a/java/sca/contrib/samples/domain-webapp/src/main/resources/webroot/style.css +++ /dev/null @@ -1,176 +0,0 @@ -/* - * 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. - */ - -p,table,li,h1,h2,h3 -{ -font-family: verdana, arial, 'sans serif'; -} - -p, h1, h2, h3, table, li, hr -{ -margin-left: 10pt; -} - -table -{ -border-color: black; -border-collapse: separate; -border-spacing: 0px 1px; - -margin-right: 10pt; -margin-left: 10pt; -width: 800px; -} - -.sourceDetailsTable -{ -width: 600px; -} - -tr, td -{ -margin-left: 0pt; -margin-right: 0pt; -padding-left: 10pt; -font-size: 90%; -} - -p,li,th -{ -font-size: 90%; -margin-left: 10pt; -} - -pre -{ -margin-left: 10pt; -} - -body -{ -#ffffff; -} - -h1,h2,h3,hr -{ -color: firebrick; -} - -a:link {COLOR: firebrick;} -a:visited {COLOR: firebrick;} -a:active {COLOR: navy;} - -.link -{ -COLOR: firebrick; -text-decoration: underline; -} - -.clickable -{ -cursor: pointer -} - -.unread_title -{ -font-weight: bold; -} - -.read_title -{ -font-weight: normal; -} - -.summary -{ -color: DimGrey; -} - -.hidden -{ -display: none; -} - -.source_name -{ -width: 600px; -} - -.alert_text -{ -width: 600px; -} - -.alert_data -{ -margin-left: 10px; -width: 800px; -height: 800px; -} - -.source_0 -{ -background-color: LightGreen; -} - -.source_1 -{ -background-color: LightSkyBlue; -} - -.source_2 -{ -background-color: Khaki; -} - -.source_3 -{ -background-color: LightPink; -} - -.source_4 -{ -background-color: Orange; -} - -.source_5 -{ -background-color: LightCoral; -} - -.source_6 -{ -background-color: Orchid; -} - -.source_7 -{ -background-color: Peru; -} - -.source_8 -{ -background-color: SpringGreen; -} - -.source_9 -{ -background-color: LightGrey; -} - -- cgit v1.2.3