diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-25 14:16:34 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-25 14:16:34 +0000 |
| commit | ab1d1e59f05a13e13c9621afd2b5393092fd99c9 (patch) | |
| tree | aa9ef0498cabfcdf5f339c1c147c93f42a81e4a0 /sca-java-2.x/trunk | |
| parent | d163c0274c828c0caa9c261d06a5e6284b3d4dcf (diff) | |
Add a new helloworld sample as a plain sca contribution, and itest for the helloworld sample, and a fix to DomainNode so it works with that in a standalone domain
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884111 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
12 files changed, 334 insertions, 10 deletions
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml b/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml new file mode 100644 index 0000000000..c8817be0f2 --- /dev/null +++ b/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml @@ -0,0 +1,38 @@ +<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-samples-helloworld</artifactId>
+ <name>Apache Tuscany SCA iTest Samples Helloworld</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-node</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java new file mode 100644 index 0000000000..38dc80bed3 --- /dev/null +++ b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/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.helloworld;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface Helloworld {
+ String sayHello(String name);
+}
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java new file mode 100644 index 0000000000..e8c8e197af --- /dev/null +++ b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java @@ -0,0 +1,33 @@ +package itest.helloworld;
+
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.domain.node.DomainNode;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class HelloworldDomainNodeTestCase {
+
+ DomainNode node;
+
+ @Before
+ public void setUp() throws Exception {
+ node = new DomainNode("../../../samples/helloworld/target/sample-helloworld.jar");
+ }
+
+ @Test
+ public void testHelloworld() throws NoSuchServiceException {
+ assertEquals(1, node.getServiceNames().size());
+ assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0));
+ Helloworld service = node.getService(Helloworld.class, "HelloworldComponent");
+ assertEquals("Hello petra", service.sayHello("petra"));
+ }
+
+ @After
+ public void stop() {
+ node.stop();
+ }
+}
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java new file mode 100644 index 0000000000..f4048e0ccc --- /dev/null +++ b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java @@ -0,0 +1,31 @@ +package itest.helloworld;
+
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HelloworldNodeTestCase {
+
+ Node node;
+
+ @Before
+ public void setUp() throws Exception {
+ node = NodeFactory.newInstance().createNode(null, new String[]{"../../../samples/helloworld/target/sample-helloworld.jar"}).start();
+ }
+
+ @Test
+ public void testHelloworld() {
+ Helloworld service = node.getService(Helloworld.class, "HelloworldComponent");
+ assertEquals("Hello petra", service.sayHello("petra"));
+ }
+
+ @After
+ public void stop() {
+ node.stop();
+ }
+}
diff --git a/sca-java-2.x/trunk/modules/domain-node/pom.xml b/sca-java-2.x/trunk/modules/domain-node/pom.xml index a4b86b41a3..86d7c96684 100644 --- a/sca-java-2.x/trunk/modules/domain-node/pom.xml +++ b/sca-java-2.x/trunk/modules/domain-node/pom.xml @@ -48,7 +48,6 @@ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-client-impl</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
<dependency>
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java index 135c6a79c7..ad85899aaa 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java @@ -30,6 +30,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
import org.apache.tuscany.sca.node.impl.NodeImpl;
import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
@@ -60,7 +61,7 @@ public class DomainNode { public DomainNode(String configURI, String[] contributionLocations) {
this.domainRegistryURI = configURI;
initDomainName(configURI);
- nodeFactory = NodeFactory.getInstance(domainRegistryURI);
+ nodeFactory = NodeFactory.getInstance(domainName);
for (String loc : contributionLocations) {
addContribution(loc);
}
@@ -82,7 +83,12 @@ public class DomainNode { if (nodes.containsKey(uri)) {
throw new IllegalArgumentException("contribution already added: " + uri);
}
- Node node = nodeFactory.createNode((String)null, new String[] {uri}, new String[] {location}).start();
+ NodeConfiguration configuration = nodeFactory.createNodeConfiguration();
+ configuration.addContribution(uri, location);
+ configuration.setDomainRegistryURI(domainRegistryURI);
+ configuration.setDomainURI(domainName);
+ configuration.setURI(uri); //???
+ Node node = nodeFactory.createNode(configuration).start();
nodes.put(uri, node);
}
@@ -127,19 +133,19 @@ public class DomainNode { public <T> T getService(Class<T> interfaze, String uri) throws NoSuchServiceException {
try {
- return SCAClientFactory.newInstance(URI.create(getDomainConfigURI())).getService(interfaze, uri);
+ return SCAClientFactory.newInstance(URI.create(getDomainName())).getService(interfaze, uri);
} catch (NoSuchDomainException e) {
throw new IllegalStateException(e);
}
}
protected void initDomainName(String configURI) {
- URI uri = URI.create(fixScheme(configURI));
- String dn = uri.getHost();
- if (dn == null || dn.length() < 1) {
- dn = DEFAULT_DOMAIN_NAME;
- }
- domainName = dn;
+// URI uri = URI.create(fixScheme(configURI));
+// String dn = uri.getHost();
+// if (dn == null || dn.length() < 1) {
+// dn = DEFAULT_DOMAIN_NAME;
+// }
+ domainName = configURI;
}
/**
diff --git a/sca-java-2.x/trunk/samples/helloworld/pom.xml b/sca-java-2.x/trunk/samples/helloworld/pom.xml new file mode 100644 index 0000000000..10e0a84cec --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/pom.xml @@ -0,0 +1,50 @@ +<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>sample-helloworld</artifactId>
+ <name>Apache Tuscany SCA Sample Helloworld</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
diff --git a/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/Helloworld.java new file mode 100644 index 0000000000..f4e8c50448 --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/Helloworld.java @@ -0,0 +1,28 @@ +/*
+ * 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 org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface Helloworld {
+
+ String sayHello(String name);
+
+}
diff --git a/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/HelloworldImpl.java new file mode 100644 index 0000000000..089b1a4290 --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/src/main/java/sample/HelloworldImpl.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 sample;
+
+public class HelloworldImpl implements Helloworld {
+
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+
+}
diff --git a/sca-java-2.x/trunk/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..9dd08bf56c --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ +<?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://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:sample="http://sample">
+ <deployable composite="sample:helloworld"/>
+</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/helloworld/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..7d79a71783 --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/src/main/resources/helloworld.composite @@ -0,0 +1,29 @@ +<?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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://sample"
+ name="helloworld">
+
+ <component name="HelloworldComponent">
+ <implementation.java class="sample.HelloworldImpl"/>
+ </component>
+
+</composite>
diff --git a/sca-java-2.x/trunk/samples/helloworld/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/helloworld/src/test/java/sample/HelloworldTestCase.java new file mode 100644 index 0000000000..7e679ec0e9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/helloworld/src/test/java/sample/HelloworldTestCase.java @@ -0,0 +1,33 @@ +/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class HelloworldTestCase {
+
+ @Test
+ public void testSayHello() {
+ HelloworldImpl helloworld = new HelloworldImpl();
+ assertEquals("Hello Petra", helloworld.sayHello("Petra"));
+ }
+
+}
|