Copy 1.6 release to new 1.6.1 branch

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

4 files changed, 198 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
new file mode 100644
index 0000000000..c1eae6a64d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
@@ -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 Helloworld {

+

+    String getGreetings(String name);

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
new file mode 100644
index 0000000000..765e6a3f18
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
@@ -0,0 +1,52 @@
+/*

+ * 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.host.embedded.SCADomain;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ */

+public class JeeTestCase {

+

+

+    @Before

+    public void init() {

+    }

+

+    @Test

+    public void testSayHello() throws Exception {

+        SCADomain scaDomain = SCADomain.newInstance("http://localhost", "/", "test.composite");

+

+        Helloworld service = scaDomain.getService(Helloworld.class, "TestJEE/HelloworldServiceBean_HelloworldService");

+

+        //assertEquals("hello beate", service.getGreetings("beate"));

+

+        scaDomain.close();

+    }

+

+    @After

+    public void end() {

+    }

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
new file mode 100644
index 0000000000..7f7cff8810
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
@@ -0,0 +1,44 @@
+/*

+ * 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.apache.tuscany.sca.core.ExtensionPointRegistry;

+import org.apache.tuscany.sca.implementation.jee.JEEImplementation;

+import org.apache.tuscany.sca.provider.ImplementationProvider;

+import org.apache.tuscany.sca.provider.ImplementationProviderFactory;

+import org.apache.tuscany.sca.runtime.RuntimeComponent;

+

+public class MockImplementationProviderFactory implements ImplementationProviderFactory<JEEImplementation>{

+

+    public MockImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {

+        

+    }

+

+    

+    public ImplementationProvider createImplementationProvider(RuntimeComponent component,

+                                                               JEEImplementation Implementation) {

+        return null;

+    }

+

+    public Class<JEEImplementation> getModelType() {

+        return null;

+    }

+

+}

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
new file mode 100644
index 0000000000..b534297148
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.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 itest;

+

+import java.io.File;

+import java.net.URI;

+import java.util.HashMap;

+import java.util.Map;

+

+import org.apache.tuscany.sca.contribution.Contribution;

+import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo;

+import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo;

+import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector;

+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

+import org.apache.tuscany.sca.core.ExtensionPointRegistry;

+

+public class SomeCustomModelResolver implements ModelResolver {

+

+    private Map<URI, ExternalEarInfo> map = new HashMap<URI, ExternalEarInfo>();

+    private JavaEEIntrospector jeeIntrospector;

+    

+    

+    public SomeCustomModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) {

+       jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class);

+    }

+        

+    public void addModel(Object resolved) {

+        ExternalEarInfo jeeApp = (ExternalEarInfo)resolved;

+        map.put(jeeApp.getAppInfo().getUri(), jeeApp);

+    }

+

+    public Object removeModel(Object resolved) {

+        return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri());

+    }

+

+    public <T> T resolveModel(final Class<T> modelClass, T unresolved) {

+        URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri();

+        if (uri != null) {

+            ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri);

+            if (resolved != null) {

+                return modelClass.cast(resolved);

+            } else {

+                try {

+                    File f = new File(uri.toString());

+                    final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL());

+                    return (T)new ExternalEarInfo() {

+                        public JavaEEApplicationInfo getAppInfo() {

+                            return (JavaEEApplicationInfo)o;

+                        }

+                    };

+                } catch (Exception e) {

+                    throw new RuntimeException(e);

+                }

+            }

+        }

+

+        return unresolved;

+    }

+

+}