From 579b29c38c8fad4d2cac2ce3fb94710417ebcfe5 Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Sat, 25 Sep 2010 16:32:27 +0000 Subject: TUSCANY-3677 getting-started clearup git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1001256 13f79535-47bb-0310-9956-ffa450edef68 --- .../webapps/helloworld-webapp/README | 7 ++ .../webapps/helloworld-webapp/pom.xml | 118 +++++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 47 ++++++++ .../src/test/java/itest/Helloworld.java | 27 +++++ .../test/java/itest/HelloworldTestCaseFIXME.java | 44 ++++++++ .../src/test/resources/test-web.xml | 30 ++++++ .../getting-started/webapps/helloworld/README | 7 -- .../getting-started/webapps/helloworld/pom.xml | 118 --------------------- .../helloworld/src/main/webapp/WEB-INF/web.xml | 47 -------- .../helloworld/src/test/java/itest/Helloworld.java | 27 ----- .../test/java/itest/HelloworldTestCaseFIXME.java | 44 -------- .../helloworld/src/test/resources/test-web.xml | 30 ------ 12 files changed, 273 insertions(+), 273 deletions(-) create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/main/webapp/WEB-INF/web.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/Helloworld.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/resources/test-web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml (limited to 'sca-java-2.x/trunk/samples') diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/README new file mode 100644 index 0000000000..828aadb0f1 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/README @@ -0,0 +1,7 @@ +The README in the /samples directory provides +general instructions about building and running samples. (where +distribution-unpack-dir is the directory in which you unpacked the tuscany +binary distribution archive). Take a look there first (noting at you read it that this sample +is not a new style sample). + +TODO - finish \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/pom.xml new file mode 100644 index 0000000000..8d70ec23a7 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/pom.xml @@ -0,0 +1,118 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../../pom.xml + + + sample-helloworld-webapp + Apache Tuscany SCA Sample Helloworld + war + + + + + org.apache.tuscany.sca.shades + tuscany-base-nodep + 2.0-SNAPSHOT + + + + junit + junit + 4.8.1 + test + + + + + + helloworld + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + compile + + copy + + + + + org.apache.tuscany.sca + sample-helloworld + ${pom.version} + + src/main/webapp/WEB-INF/sca-contributions + + + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.18 + + helloworld + foo + 9999 + + + + start-jetty + process-test-classes + + run + + + src/test/resources/test-web.xml + 0 + true + + + 8085 + + + + + + stop-jetty + prepare-package + + stop + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..85aed34b26 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,47 @@ + + + + + Apache Tuscany Helloworld Sample + + + contributions + /WEB-INF/sca-contributions + + + + org.apache.tuscany.sca.config + uri:default + + + + tuscany + org.apache.tuscany.sca.host.webapp.TuscanyServletFilter + + + + tuscany + /* + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/Helloworld.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/Helloworld.java new file mode 100644 index 0000000000..f1ccf0b1ba --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/Helloworld.java @@ -0,0 +1,27 @@ +/* + * 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 itest; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Helloworld { + String sayHello(String name); +} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java new file mode 100644 index 0000000000..c1c2c6aae0 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/java/itest/HelloworldTestCaseFIXME.java @@ -0,0 +1,44 @@ +/* + * 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 itest; + +import static org.junit.Assert.assertEquals; + +import java.net.URI; + +import org.junit.Test; +import org.oasisopen.sca.NoSuchDomainException; +import org.oasisopen.sca.NoSuchServiceException; +import org.oasisopen.sca.client.SCAClientFactory; + +/** + */ +public class HelloworldTestCaseFIXME { + + @Test + public void testHelloworld() throws NoSuchDomainException, NoSuchServiceException { +// TODO: need to fix the config URI so it works properly +// SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("uri:default?remote=127.0.0.1:54321")); + SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscany:default?remotes=192.168.1.64")); + Helloworld helloworld = factory.getService(Helloworld.class, "HelloworldComponent"); + assertEquals("Hello World", helloworld.sayHello("World")); + } + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/resources/test-web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/resources/test-web.xml new file mode 100644 index 0000000000..a68aa28698 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld-webapp/src/test/resources/test-web.xml @@ -0,0 +1,30 @@ + + + + + + org.apache.tuscany.sca.config + uri:default?bind=127.0.0.1:54321 + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/README b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/README +++ /dev/null @@ -1,7 +0,0 @@ -The README in the /samples directory provides -general instructions about building and running samples. (where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive). Take a look there first (noting at you read it that this sample -is not a new style sample). - -TODO - finish \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/pom.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/pom.xml deleted file mode 100644 index 8d70ec23a7..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../../pom.xml - - - sample-helloworld-webapp - Apache Tuscany SCA Sample Helloworld - war - - - - - org.apache.tuscany.sca.shades - tuscany-base-nodep - 2.0-SNAPSHOT - - - - junit - junit - 4.8.1 - test - - - - - - helloworld - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - compile - - copy - - - - - org.apache.tuscany.sca - sample-helloworld - ${pom.version} - - src/main/webapp/WEB-INF/sca-contributions - - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - helloworld - foo - 9999 - - - - start-jetty - process-test-classes - - run - - - src/test/resources/test-web.xml - 0 - true - - - 8085 - - - - - - stop-jetty - prepare-package - - stop - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 85aed34b26..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Apache Tuscany Helloworld Sample - - - contributions - /WEB-INF/sca-contributions - - - - org.apache.tuscany.sca.config - uri:default - - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java deleted file mode 100644 index f1ccf0b1ba..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/Helloworld.java +++ /dev/null @@ -1,27 +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 itest; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - String sayHello(String name); -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java deleted file mode 100644 index c1c2c6aae0..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java +++ /dev/null @@ -1,44 +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 itest; - -import static org.junit.Assert.assertEquals; - -import java.net.URI; - -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - */ -public class HelloworldTestCaseFIXME { - - @Test - public void testHelloworld() throws NoSuchDomainException, NoSuchServiceException { -// TODO: need to fix the config URI so it works properly -// SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("uri:default?remote=127.0.0.1:54321")); - SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscany:default?remotes=192.168.1.64")); - Helloworld helloworld = factory.getService(Helloworld.class, "HelloworldComponent"); - assertEquals("Hello World", helloworld.sayHello("World")); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml b/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml deleted file mode 100644 index a68aa28698..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/webapps/helloworld/src/test/resources/test-web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - org.apache.tuscany.sca.config - uri:default?bind=127.0.0.1:54321 - - - -- cgit v1.2.3