Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it.

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

6 files changed, 282 insertions, 0 deletions

diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
new file mode 100644
index 0000000000..83d0224ad4
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
@@ -0,0 +1,129 @@
+/*
+ * 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.contribution.updater.impl;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.node.SCANode;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test ContributionUpdater.
+ * 
+ */
+public class ContributionUpdaterTestCase {
+
+    // private static SCADomain domain;
+    private static SCANode node;
+    private static MetaComponentHello helloMeta;
+
+    @Before
+    public void setUp() throws Exception {
+        /*
+         * System.out.println("Setting up domain");
+         * 
+         * SCADomainFactory domainFactory = SCADomainFactory.newInstance();
+         * domain = domainFactory.createSCADomain("http://localhost:9999");
+         * 
+         * System.out.println("Setting up calculator nodes");
+         * 
+         * ClassLoader cl = ContributionUpdaterTestCase.class.getClassLoader();
+         * 
+         * SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); try {
+         * log.info("Staring entropy handler"); prng =
+         * SecureRandom.getInstance("SHA1PRNG"); } catch
+         * (NoSuchAlgorithmException e) { // TODO Auto-generated catch block
+         * e.printStackTrace(); } componentName =
+         * "HelloComponent"+this.uniqueID();
+         * t.setAttribute("componentName",componentName);
+         * 
+         * node = nodeFactory.createSCANode("http://localhost:8100/nodeA",
+         * "http://localhost:9999"); node.addContribution("nodeA",
+         * cl.getResource("nodeA/")); node.addToDomainLevelComposite(new
+         * QName("http://test", "HelloComposite")); node.start();
+         * SCADomainFinder domainFinder = SCADomainFinder.newInstance(); domain =
+         * domainFinder.getSCADomain("http://localhost:9999"); helloMeta = new
+         * MetaComponentHello();
+         * helloMeta.setComponentClass("org.apache.tuscany.sca.contribution.updater.impl.HelloComponent");
+         */
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+    }
+
+    @Test
+    public void testAddNewComponent() throws ClassNotFoundException,
+            MalformedURLException {
+        /*
+         * String helloComponent1 = "<component
+         * xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"
+         * name=\"HelloComponent1\">\n" + "<implementation.java
+         * class=\"org.apache.tuscany.sca.contribution.updater.impl.HelloComponent\"/>"+ "</component>";
+         * MetaComponent mc =
+         * MetaComponentFactory.newMetaComponent("HelloComponent1",helloComponent1);
+         * try { ((SCANodeImpl) node).addComponentToComposite(mc, "nodeA",
+         * "HelloComposite.composite"); GreetService greet =
+         * node.getDomain().getService(GreetService.class, "HelloComponent1");
+         * greet.sayHello("Italian").equals("Ciao"); } catch (Exception e) {
+         * Assert.fail(e.getMessage()); }
+         */
+        Assert.assertEquals("skip", "skip");
+    }
+
+    @Test
+    public void testWireComponents() throws ClassNotFoundException,
+            MalformedURLException {
+        Assert.assertEquals("skip", "skip");
+        /*
+         * String helloComponent1 = "<component
+         * xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"
+         * name=\"HelloComponent1\">\n" + "<implementation.java
+         * class=\"org.apache.tuscany.sca.contribution.updater.impl.HelloComponent\"/>"+ "</component>";
+         * String helloComponent2 = "<component
+         * xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"
+         * name=\"HelloComponent2\">\n" + "<implementation.java
+         * class=\"org.apache.tuscany.sca.contribution.updater.impl.HelloComponent\"/>"+ "</component>";
+         * MetaComponent mc1 =
+         * MetaComponentFactory.newMetaComponent("HelloComponent1",helloComponent1);
+         * MetaComponent mc2 =
+         * MetaComponentFactory.newMetaComponent("HelloComponent2",helloComponent2);
+         * 
+         * try { ((SCANodeImpl) node).addComponentToComposite(mc1, "nodeA",
+         * "HelloComposite.composite"); ((SCANodeImpl)
+         * node).addComponentToComposite(mc2, "nodeA",
+         * "HelloComposite.composite"); GreetService greet =
+         * node.getDomain().getService(GreetService.class, "HelloComponent1");
+         * greet.sayHello("Italian").equals("Ciao"); } catch (Exception e) {
+         * Assert.fail(e.getMessage()); }
+         */
+    }
+
+}
diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
new file mode 100644
index 0000000000..0eb7fb692b
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
@@ -0,0 +1,26 @@
+/*
+ * 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.contribution.updater.impl;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface GreetService {
+    String sayHello(String language);
+}
diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
new file mode 100644
index 0000000000..38fa2721bb
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
@@ -0,0 +1,39 @@
+/*
+ * 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.contribution.updater.impl;
+
+import org.osoa.sca.annotations.Service;
+
+@Service(GreetService.class)
+public class HelloComponent implements GreetService {
+    private String[][] languageGreets = {
+            { "English", "Italian", "Japanese", "German" },
+            { "Hello!", "Ciao!", "Konnici wa!", "Hallo!" } };
+
+    public String sayHello(String language) {
+        for (int i = 0; i < 4; ++i)
+            for (int j = 0; j < 4; ++j) {
+                if (language.equals(languageGreets[i][j])) {
+                    return languageGreets[0][0];
+                }
+            }
+        return "I don't speak your language";
+    }
+
+}
diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
new file mode 100644
index 0000000000..1495ff2cea
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
@@ -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 org.apache.tuscany.sca.contribution.updater.impl;
+
+import java.io.StringReader;
+import java.net.URI;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.logging.Logger;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.assembly.MetaComponent;
+
+public class MetaComponentHello implements MetaComponent {
+    private String componentName;
+    private String scdl;
+    private boolean loadedFromString = false;
+    private Logger log = Logger.getLogger(MetaComponentHello.class.getName());
+
+    public MetaComponentHello() {
+    }
+
+    private MetaComponentHello(String scdl, boolean loadedFromString) {
+        this.scdl = scdl;
+        this.loadedFromString = loadedFromString;
+    }
+
+    public MetaComponent fromSCDL(String scdl) {
+        return new MetaComponentHello(scdl, true);
+    }
+
+    public XMLStreamReader build() throws Exception {
+        XMLInputFactory factory = XMLInputFactory.newInstance();
+        return factory.createXMLStreamReader(new StringReader(scdl));
+    }
+
+    public String getName() {
+
+        return componentName;
+    }
+
+}
diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite b/branches/sca-android/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
new file mode 100644
index 0000000000..76714a0e9c
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
@@ -0,0 +1,27 @@
+<?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://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://test"
+           xmlns:test="http://test"
+           name="HelloComposite">
+          <component name="HelloComponentService">
+          <implementation.java="org.apache.tuscany.sca.contribution.updater.impl.HelloComponent"/>
+          </component> 
+</composite>
\ No newline at end of file
diff --git a/branches/sca-android/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar b/branches/sca-android/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
new file mode 100644
index 0000000000..9c46c679d2
--- /dev/null
+++ b/branches/sca-android/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar