Author: antelder
Date: Fri Nov 20 16:27:35 2009
New Revision: 882633
URL: http://svn.apache.org/viewvc?rev=882633&view=rev
Log:
Start of some itest around nodes and domains. Can be merged with the other
nodes itests but for now do it separately
Added:
tuscany/java/sca/itest/domains/ (with props)
tuscany/java/sca/itest/domains/helloworld/ (with props)
tuscany/java/sca/itest/domains/helloworld/pom.xml
tuscany/java/sca/itest/domains/helloworld/src/
tuscany/java/sca/itest/domains/helloworld/src/main/
tuscany/java/sca/itest/domains/helloworld/src/main/java/
tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/
tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
tuscany/java/sca/itest/domains/helloworld/src/main/resources/
tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/
tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
tuscany/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite
tuscany/java/sca/itest/domains/interfaces/ (with props)
tuscany/java/sca/itest/domains/interfaces/pom.xml
tuscany/java/sca/itest/domains/interfaces/src/
tuscany/java/sca/itest/domains/interfaces/src/main/
tuscany/java/sca/itest/domains/interfaces/src/main/java/
tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/
tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java
tuscany/java/sca/itest/domains/pom.xml
tuscany/java/sca/itest/domains/standalone/ (with props)
tuscany/java/sca/itest/domains/standalone/pom.xml
tuscany/java/sca/itest/domains/standalone/src/
tuscany/java/sca/itest/domains/standalone/src/test/
tuscany/java/sca/itest/domains/standalone/src/test/java/
tuscany/java/sca/itest/domains/standalone/src/test/java/itest/
tuscany/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
Propchange: tuscany/java/sca/itest/domains/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 20 16:27:35 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/java/sca/itest/domains/helloworld/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 20 16:27:35 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/java/sca/itest/domains/helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/helloworld/pom.xml?rev=882633&view=auto
==============================================================================
--- tuscany/java/sca/itest/domains/helloworld/pom.xml (added)
+++ tuscany/java/sca/itest/domains/helloworld/pom.xml Fri Nov 20 16:27:35 2009
@@ -0,0 +1,83 @@
+<?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-domains-helloworld</artifactId>
+ <name>Apache Tuscany SCA itest domain 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>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-domain-interfaces</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>tuscany-zip-contribution-descriptor</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+
<descriptor>tuscany-zip-contribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Added:
tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java?rev=882633&view=auto
==============================================================================
---
tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
(added)
+++
tuscany/java/sca/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
Fri Nov 20 16:27:35 2009
@@ -0,0 +1,38 @@
+/*
+ * 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 itest.Helloworld;
+
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+
+...@scope("COMPOSITE") @EagerInit
+public class HelloworldImpl implements Helloworld {
+
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+
+ @Init
+ public void init() {
+ System.out.println(sayHello("world"));
+ }
+}
Added:
tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml?rev=882633&view=auto
==============================================================================
---
tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
tuscany/java/sca/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
Fri Nov 20 16:27:35 2009
@@ -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:itest="http://org.apache.tuscany.sca.itest";>
+ <deployable composite="itest:helloworld"/>
+</contribution>
\ No newline at end of file
Added:
tuscany/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite?rev=882633&view=auto
==============================================================================
---
tuscany/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite
(added)
+++
tuscany/java/sca/itest/domains/helloworld/src/main/resources/helloworld.composite
Fri Nov 20 16:27:35 2009
@@ -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://org.apache.tuscany.sca.itest";
+ name="helloworld">
+
+ <component name="HelloworldComponent">
+ <implementation.java class="itest.HelloworldImpl"/>
+ </component>
+
+</composite>
Propchange: tuscany/java/sca/itest/domains/interfaces/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 20 16:27:35 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/java/sca/itest/domains/interfaces/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/interfaces/pom.xml?rev=882633&view=auto
==============================================================================
--- tuscany/java/sca/itest/domains/interfaces/pom.xml (added)
+++ tuscany/java/sca/itest/domains/interfaces/pom.xml Fri Nov 20 16:27:35 2009
@@ -0,0 +1,51 @@
+<?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-domains-interfaces</artifactId>
+ <name>Apache Tuscany SCA itest domain interfaces</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>
Added:
tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java?rev=882633&view=auto
==============================================================================
---
tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java
(added)
+++
tuscany/java/sca/itest/domains/interfaces/src/main/java/itest/Helloworld.java
Fri Nov 20 16:27:35 2009
@@ -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 itest;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+...@remotable
+public interface Helloworld {
+
+ String sayHello(String name);
+
+}
Added: tuscany/java/sca/itest/domains/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/pom.xml?rev=882633&view=auto
==============================================================================
--- tuscany/java/sca/itest/domains/pom.xml (added)
+++ tuscany/java/sca/itest/domains/pom.xml Fri Nov 20 16:27:35 2009
@@ -0,0 +1,37 @@
+<?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-domains</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Domians Integration Tests</name>
+
+ <modules>
+ <module>interfaces</module>
+ <module>helloworld</module>
+ <module>standalone</module>
+ </modules>
+</project>
Propchange: tuscany/java/sca/itest/domains/standalone/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 20 16:27:35 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/java/sca/itest/domains/standalone/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/standalone/pom.xml?rev=882633&view=auto
==============================================================================
--- tuscany/java/sca/itest/domains/standalone/pom.xml (added)
+++ tuscany/java/sca/itest/domains/standalone/pom.xml Fri Nov 20 16:27:35 2009
@@ -0,0 +1,57 @@
+<?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>itest-domains-standalone</artifactId>
+ <name>Apache Tuscany SCA itest domain standalone</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-node</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- TODO: shouldnt need to have this dependency, should be in
DomainNode -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-client-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+</project>
Added:
tuscany/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java?rev=882633&view=auto
==============================================================================
---
tuscany/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
(added)
+++
tuscany/java/sca/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
Fri Nov 20 16:27:35 2009
@@ -0,0 +1,66 @@
+/*
+ * 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 org.apache.tuscany.sca.domain.node.DomainNode;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+public class StandaloneTestCase{
+
+ private static DomainNode node;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ node = new DomainNode();
+
node.addContribution("../helloworld/target/itest-domains-helloworld.zip");
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ node.stop();
+ }
+
+ @Test
+ public void testServices() throws Exception {
+ assertEquals(1, node.getServiceNames().size());
+ assertEquals("HelloworldComponent/Helloworld",
node.getServiceNames().get(0));
+ }
+
+ @Test
+ public void testDuplicateComponents() throws Exception {
+ try {
+
node.addContribution("../helloworld/target/itest-domains-helloworld.zip",
"dup");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // verify the old one is still there
+ // TODO: doesn't work correctly yet
+// assertEquals(1, node.getServiceNames().size());
+// assertEquals("HelloworldComponent/Helloworld",
node.getServiceNames().get(0));
+ }
+
+}
