From 0d6d7922ed17cca55ec36ff2626d1080e76d6d13 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 07:11:27 +0000 Subject: Remove old beta1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027389 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/hello/HelloWorld.java | 30 ------- .../src/test/java/hello/HelloWorldClient.java | 50 ----------- .../src/test/java/hello/HelloWorldImpl.java | 30 ------- .../equinox/launcher/EquinoxOSGiHostTestCase.java | 100 --------------------- .../equinox/launcher/NodeLauncherTestCase.java | 67 -------------- .../src/test/resources/HelloWorld.composite | 34 ------- 6 files changed, 311 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite (limited to 'sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test') diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java deleted file mode 100644 index e3fcdfd25f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java +++ /dev/null @@ -1,30 +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 hello; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * HelloWorld interface - */ -@Remotable -public interface HelloWorld { - String hello(String name); -} diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java deleted file mode 100644 index 8232acb658..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java +++ /dev/null @@ -1,50 +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 hello; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -@Scope("COMPOSITE") -@EagerInit -public class HelloWorldClient { - - private HelloWorld hw; - - @Reference - public void setHelloWorld(HelloWorld hw) { - this.hw = hw; - } - - @Init - public void hello() { - // Say hello - System.out.println("Contribution ClassLoader: " + getClass().getClassLoader()); - System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader()); - System.out.println(hw.hello("Equinox")); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java deleted file mode 100644 index e51d3c79d9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java +++ /dev/null @@ -1,30 +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 hello; - -/** - * HelloWorldImpl - */ -public class HelloWorldImpl implements HelloWorld { - public String hello(String name) { - System.out.println("Name: " + name); - return "Hello, " + name; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java deleted file mode 100644 index 5728ad2e07..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java +++ /dev/null @@ -1,100 +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 org.apache.tuscany.sca.node.equinox.launcher; - -import java.util.Dictionary; -import java.util.Enumeration; - -import org.junit.Assert; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - - -/** - * Test case for equinox host - */ -public class EquinoxOSGiHostTestCase { - - @Test - public void testStartThenStop() { - EquinoxHost host = new EquinoxHost(); - BundleContext context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - } - - @Test - public void testStartThenStopTwice() { - EquinoxHost host = new EquinoxHost(); - BundleContext context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - - host = new EquinoxHost(); - context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - } - - public static String toString(Bundle b, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); - int s = b.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - sb.append(" ").append(b.getLocation()); - if (verbose) { - Dictionary dict = b.getHeaders(); - Enumeration keys = dict.keys(); - while (keys.hasMoreElements()) { - Object key = keys.nextElement(); - sb.append(" ").append(key).append("=").append(dict.get(key)); - } - } - return sb.toString(); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java deleted file mode 100644 index 5cc40ca77f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java +++ /dev/null @@ -1,67 +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 org.apache.tuscany.sca.node.equinox.launcher; - -import org.apache.tuscany.sca.node.Node; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * - */ -public class NodeLauncherTestCase { - private static NodeLauncher launcher; - - @BeforeClass - public static void setUp() { - System.setProperty("osgi.configuration.area", "target/equinox/configuration"); - try { - launcher = NodeLauncher.newInstance(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @AfterClass - public static void tearDown() { - System.clearProperty("osgi.configuration.area"); - if (launcher != null) { - launcher.destroy(); - } - - } - - @Test - public void testLaunch() throws Exception { - String location = ContributionLocationHelper.getContributionLocation(getClass()); - Node node = launcher.createNode("HelloWorld.composite", new Contribution("test", location)); - node.start(); - node.stop(); - } - - @Test - @Ignore("contribution-osgi issue") - public void testLaunchDomain() throws Exception { - DomainManagerLauncher.main(new String[] {}); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite deleted file mode 100644 index 32ec5f0e2f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - -- cgit v1.2.3