Create branch for 2.0 beta2 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040693 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 310 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
new file mode 100644
index 0000000000..aa9cd50abc
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
@@ -0,0 +1,95 @@
+/*
+ * 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.extensibility.equinox;
+
+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 start/stop the Equinox runtime.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class EquinoxHostTestCase {
+    @Test
+    public void testStartThenStop() {
+        TestEquinoxHost host = new TestEquinoxHost();
+        BundleContext context = host.start();
+        Assert.assertNotNull(context);
+        for (Bundle b : context.getBundles()) {
+            System.out.println(toString(b, false));
+        }
+        host.stop();
+    }
+
+    @Test
+    public void testStartTwice() {
+        TestEquinoxHost host = new TestEquinoxHost();
+        host.start();
+        try {
+            host.start();
+            Assert.fail();
+        } catch (IllegalStateException e) {
+            Assert.assertTrue(IllegalStateException.class.isInstance(e.getCause()));
+        } finally {
+            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<Object, Object> dict = b.getHeaders();
+            Enumeration<Object> 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-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
new file mode 100644
index 0000000000..72c25427d6
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
@@ -0,0 +1,138 @@
+/*
+ * 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.extensibility.equinox;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+
+import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Test the Equinox service discoverer.
+ *
+ * @version $Rev$ $Date$
+ */
+public class EquinoxServiceDiscovererTestCase {
+    private static EquinoxServiceDiscoverer discoverer;
+    private static Bundle testBundle1;
+    private static Bundle testBundle2;
+    private static TestEquinoxHost host;
+
+    private static String getState(Bundle b) {
+        StringBuffer sb = new StringBuffer();
+        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 ");
+        }
+        return sb.toString();
+
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        host = new TestEquinoxHost();
+        BundleContext context = host.start();
+
+        InputStream is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v1.jar");
+        testBundle1 = context.installBundle("test-bundle-v1", is);
+        is.close();
+        
+        is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v2.jar");
+        testBundle2 = context.installBundle("test-bundle-v2", is);
+        is.close();
+
+        discoverer = new EquinoxServiceDiscoverer(context);
+    }
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (testBundle1 != null) {
+            // Uninstall the bundle to clean up the cache
+            testBundle1.uninstall();
+        }
+        if (testBundle2 != null) {
+            // Uninstall the bundle to clean up the cache
+            testBundle2.uninstall();
+        }
+        host.stop();
+        System.out.println("Done");
+    }
+
+    @Test
+    public void testDiscovery() throws IOException {
+        // Both version 1 and 2 should be found because test.TestService is not a Tuscany service
+        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("test.TestService");
+        Assert.assertEquals(2, descriptors.size());
+        descriptors = discoverer.getServiceDeclarations("notthere");
+        Assert.assertEquals(0, descriptors.size());
+    }
+    
+    @Test
+    public void testDiscoverResources() throws IOException {
+        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("/META-INF/services/test.TestService");
+        Assert.assertEquals(2, descriptors.size());
+    }
+
+    @Test
+    public void testDiscoveryFirst() throws IOException {
+        ServiceDeclaration descriptor = discoverer.getServiceDeclaration("test.TestService");
+        Assert.assertNotNull(descriptor);
+        descriptor = discoverer.getServiceDeclaration("notthere");
+        Assert.assertNull(descriptor);
+    }
+
+    @Test
+    public void testTuscanyDiscovery() throws IOException {
+        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("org.apache.tuscany.sca.test.TestService");
+        // Only the version 2 should be found
+        Assert.assertEquals(1, descriptors.size());
+        ServiceDeclaration sd = descriptors.iterator().next();
+        Assert.assertEquals("2", sd.getAttributes().get("version"));
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
new file mode 100644
index 0000000000..566cd6e1a5
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
@@ -0,0 +1,77 @@
+/*
+ * 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.extensibility.equinox;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
+import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.launch.Framework;
+import org.osgi.framework.launch.FrameworkFactory;
+
+/**
+ * A test host that starts/stops Equinox.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestEquinoxHost {
+    private Framework framework;
+
+    private BundleContext init() throws Exception {
+        if (framework != null) {
+            throw new IllegalStateException("The framework is started already");
+        }
+        ServiceDeclaration sd = ServiceDiscovery.getInstance().getServiceDeclaration(FrameworkFactory.class.getName());
+        Class<?> factoryCls = sd.loadClass();
+        FrameworkFactory factory = (FrameworkFactory)factoryCls.newInstance();
+        Map<Object, Object> props = new HashMap<Object, Object>();
+        props.put("osgi.clean", "true");
+        props.put("osgi.instance.area", new File("target/workspace").toURI().toString());
+        props.put("osgi.install.area", new File("target/eclipse").toURI().toString());
+        props.put("osgi.configuration.area", new File("target/eclipse").toURI().toString());
+        framework = factory.newFramework(props);
+        framework.start();
+        return framework.getBundleContext();
+    }
+
+    public BundleContext start() {
+        try {
+            return init();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public void stop() {
+        try {
+            if (framework != null) {
+                framework.stop();
+                framework.waitForStop(2000);
+                framework = null;
+            }
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+}