You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/01/14 12:43:14 UTC
svn commit: r899163 - in
/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi: ./ src/ src/main/
src/main/java/ src/main/java/itest/ src/main/resources/
src/main/resources/META-INF/ src/test/ src/test/java/ src/test/java/test/
src/test/java/test/sc...
Author: slaws
Date: Thu Jan 14 11:43:13 2010
New Revision: 899163
URL: http://svn.apache.org/viewvc?rev=899163&view=rev
Log:
TUSCANY-3424 - A test case for the SCA client running in JSE while the runtime runs on OSGi. We don't support this scenario at the moment so this module won't be included in the build.
Added:
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java (with props)
tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/resources/
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml Thu Jan 14 11:43:13 2010
@@ -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-itest</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-scaclient-api-jse-osgi</artifactId>
+ <name>Apache Tuscany SCA iTest SCAClient API JSE and OSGI</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ </dependency>
+
+ </dependencies>
+</project>
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java Thu Jan 14 11:43:13 2010
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+ String sayHello(String name);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java Thu Jan 14 11:43:13 2010
@@ -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 org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+
+@EagerInit
+@Scope("COMPOSITE")
+public class HelloworldServiceImpl implements HelloworldService {
+
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+
+ @Init
+ public void init() {
+ System.out.println("Init - " + sayHello("world"));
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite Thu Jan 14 11:43:13 2010
@@ -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/200912"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://itest"
+ name="Helloworld">
+
+ <component name="HelloworldComponent">
+ <implementation.java class="itest.HelloworldServiceImpl"/>
+ </component>
+
+</composite>
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml Thu Jan 14 11:43:13 2010
@@ -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/200912"
+ xmlns:itest="http://itest">
+ <deployable composite="itest:Helloworld"/>
+</contribution>
\ No newline at end of file
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java?rev=899163&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java Thu Jan 14 11:43:13 2010
@@ -0,0 +1,61 @@
+/*
+ * 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.scaclient;
+
+import itest.HelloworldService;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
+import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * Test SCADomain.newInstance and invocation of a service.
+ *
+ * @version $Rev$ $Date$
+ */
+public class SCAClientTestCase extends TestCase {
+
+ private static NodeLauncher launcher;
+ private static Node node;
+
+ @Override
+ protected void setUp() throws Exception {
+ launcher = NodeLauncher.newInstance();
+ node = launcher.createNode(null, new Contribution("test", "./target/classes"));
+ System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
+ node.start();
+ }
+
+ public void testInvoke() throws Exception {
+ // At the moment the SCAClientFactory assumes that only one domain is active
+ // in a JVM. So we pass in null for the domain name and get what we're given
+ HelloworldService service =
+ SCAClientFactory.newInstance(null).getService(HelloworldService.class, "HelloworldComponent");
+ assertEquals("Hello petra", service.sayHello("petra"));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ node.stop();
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date