From b796454ac3a94879f122cc19ddec5a7ff87fe5ee Mon Sep 17 00:00:00 2001 From: nash Date: Sat, 18 Sep 2010 18:56:34 +0000 Subject: Reorganize directory structure to make import into Eclipse work git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998521 13f79535-47bb-0310-9956-ffa450edef68 --- .../store/store-test/META-INF/sca-contribution.xml | 27 ----- .../tutorials/store/store-test/client/Shopper.java | 29 ------ .../tutorials/store/store-test/pom.xml | 25 ++--- .../main/resources/META-INF/sca-contribution.xml | 27 +++++ .../store-test/src/test/java/client/Shopper.java | 29 ++++++ .../src/test/java/test/StoreSupplierTestCase.java | 115 +++++++++++++++++++++ .../store-test/test/StoreSupplierTestCase.java | 115 --------------------- 7 files changed, 179 insertions(+), 188 deletions(-) delete mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml delete mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java create mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java delete mode 100644 sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java (limited to 'sca-java-1.x/branches') diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml deleted file mode 100644 index a75087aca1..0000000000 --- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java deleted file mode 100644 index f8643d4c52..0000000000 --- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java +++ /dev/null @@ -1,29 +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 client; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Shopper { - - String shop(String itemName, int quantity); - -} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml index aeacb725a1..0fb04a3f25 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml @@ -182,22 +182,13 @@ - ${artifactId} - ${basedir}/client - ${basedir} - - - ${basedir} - - **/.*/** - **/*.java - pom.xml - build.xml - target/** - - - - + ${artifactId} + + + src/main/resources + + + org.apache.tuscany.sca tuscany-maven-ant-generator @@ -213,7 +204,7 @@ - + diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..a75087aca1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java new file mode 100644 index 0000000000..f8643d4c52 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java @@ -0,0 +1,29 @@ +/* + * 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 client; + +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Shopper { + + String shop(String itemName, int quantity); + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java new file mode 100644 index 0000000000..9cea47fbc8 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java @@ -0,0 +1,115 @@ +/* + * 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 test; + +import java.io.IOException; + +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher; +import org.apache.tuscany.sca.node.launcher.NodeLauncher; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.Ignore; + +import client.Shopper; + + +/** + * Test the store-merger. + * + * @version $Rev$ $Date$ + */ +public class StoreSupplierTestCase { + + private SCANode domainManager; + private SCANode storeSupplierNode; + private SCANode storeCatalogsNode; + private SCANode storeClientNode; + + @Before + public void setup() throws Exception { + String baseDir = System.getProperty("basedir"); + String domainDir = baseDir != null? baseDir + "/" + "../domain" : "../domain"; + + DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance(); + domainManager = managerLauncher.createDomainManager(domainDir); + domainManager.start(); + + /* helpful for debugging + try { + System.out.println("press enter to continue)"); + System.in.read(); + } catch (IOException e) { + e.printStackTrace(); + } + */ + + NodeLauncher nodeLauncher = NodeLauncher.newInstance(); + storeSupplierNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreSupplierNode"); + storeSupplierNode.start(); + + storeCatalogsNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/CatalogsNode"); + storeCatalogsNode.start(); + + storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode"); + storeClientNode.start(); + + } + + @After + public void tearDown() throws Exception { + storeSupplierNode.stop(); + storeCatalogsNode.stop(); + storeClientNode.stop(); + domainManager.stop(); + } + + + @Test + @Ignore + public void testWaitForInput() { + try { + System.out.println("press enter to continue)"); + System.in.read(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + @Test + public void testShop() { + SCAClient client = (SCAClient)storeClientNode; + Shopper shopper = client.getService(Shopper.class, "StoreClient"); + + String total = shopper.shop("Orange", 5); + System.out.println("Total: " + total); + + Assert.assertEquals("$17.75", total); + + } + +} diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java deleted file mode 100644 index 9cea47fbc8..0000000000 --- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java +++ /dev/null @@ -1,115 +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 test; - -import java.io.IOException; - -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher; -import org.apache.tuscany.sca.node.launcher.NodeLauncher; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.Ignore; - -import client.Shopper; - - -/** - * Test the store-merger. - * - * @version $Rev$ $Date$ - */ -public class StoreSupplierTestCase { - - private SCANode domainManager; - private SCANode storeSupplierNode; - private SCANode storeCatalogsNode; - private SCANode storeClientNode; - - @Before - public void setup() throws Exception { - String baseDir = System.getProperty("basedir"); - String domainDir = baseDir != null? baseDir + "/" + "../domain" : "../domain"; - - DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance(); - domainManager = managerLauncher.createDomainManager(domainDir); - domainManager.start(); - - /* helpful for debugging - try { - System.out.println("press enter to continue)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - */ - - NodeLauncher nodeLauncher = NodeLauncher.newInstance(); - storeSupplierNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreSupplierNode"); - storeSupplierNode.start(); - - storeCatalogsNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/CatalogsNode"); - storeCatalogsNode.start(); - - storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode"); - storeClientNode.start(); - - } - - @After - public void tearDown() throws Exception { - storeSupplierNode.stop(); - storeCatalogsNode.stop(); - storeClientNode.stop(); - domainManager.stop(); - } - - - @Test - @Ignore - public void testWaitForInput() { - try { - System.out.println("press enter to continue)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - - @Test - public void testShop() { - SCAClient client = (SCAClient)storeClientNode; - Shopper shopper = client.getService(Shopper.class, "StoreClient"); - - String total = shopper.shop("Orange", 5); - System.out.println("Total: " + total); - - Assert.assertEquals("$17.75", total); - - } - -} -- cgit v1.2.3