Moving 1.x trunk

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

14 files changed, 1090 insertions, 0 deletions

diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
new file mode 100644
index 0000000000..b5fe9f5d0f
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.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 org.apache.tuscany.sca.host.corba.jee;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CorbaRuntimeModuleActivator implements ModuleActivator {
+
+    private JEECorbaHost server;
+
+    public void start(ExtensionPointRegistry extensionPointRegistry) {
+
+        // Register our Corba host
+        CorbaHostExtensionPoint corbaHosts = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class);
+
+        server = new JEECorbaHost();
+        try {
+            server.start();
+            corbaHosts.addCorbaHost(server);
+        } catch (Exception e) {
+
+        }
+    }
+
+    public void stop(ExtensionPointRegistry registry) {
+        if (server != null) {
+            server.stop();
+        }
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
new file mode 100644
index 0000000000..7e714c1ca5
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
@@ -0,0 +1,162 @@
+/*
+ * 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.host.corba.jee;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.apache.tuscany.sca.host.corba.CorbaHost;
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
+import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
+import org.apache.tuscany.sca.host.corba.CorbanameURL;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Object;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+
+/**
+ * @version $Rev$ $Date$
+ * Implementation of JEE CORBA host
+ */
+public class JEECorbaHost implements CorbaHost {
+
+    public static final String ORB_NAME = "java:comp/ORB";
+
+    private List<String> registeredServants = Collections.synchronizedList(new ArrayList<String>());
+    private ORB orb;
+
+    private void registerURI(String uri) {
+        registeredServants.add(uri);
+    }
+
+    private void removeURI(String uri) {
+        registeredServants.remove(uri);
+    }
+
+    private NamingContextExt getNamingContext(String nameService) throws Exception {
+        org.omg.CORBA.Object objRef = orb.resolve_initial_references(nameService);
+        return NamingContextExtHelper.narrow(objRef);
+    }
+
+    private void handleException(Exception e) throws CorbaHostException {
+        // The cause of the Exception is JDK specific
+        if (e instanceof NotFound) {
+            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT, e);
+        } else if (e instanceof InvalidName) {
+            throw new CorbaHostException(e);
+        } else {
+            throw new CorbaHostException(e);
+        }
+    }
+
+    public void registerServant(String uri, Object servantObject) throws CorbaHostException {
+        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
+        try {
+            NamingContext namingCtx = getNamingContext(details.getNameService());
+            for (int i = 0; i < details.getNamePath().size() - 1; i++) {
+                NameComponent nc = new NameComponent(details.getNamePath().get(i), "");
+                NameComponent[] path = new NameComponent[] {nc};
+                try {
+                    namingCtx = NamingContextHelper.narrow(namingCtx.resolve(path));
+                } catch (Exception e) {
+                    namingCtx = namingCtx.bind_new_context(path);
+                }
+            }
+            NameComponent finalName =
+                new NameComponent(details.getNamePath().get(details.getNamePath().size() - 1), "");
+            try {
+                namingCtx.resolve(new NameComponent[] {finalName});
+                // no exception means that some object is already registered
+                // under this name, we need to crash here
+                throw new CorbaHostException(CorbaHostException.BINDING_IN_USE);
+            } catch (NotFound e) {
+                namingCtx.bind(new NameComponent[] {finalName}, servantObject);
+                registerURI(uri);
+            }
+        } catch (CorbaHostException e) {
+            throw e;
+        } catch (Exception e) {
+            handleException(e);
+        }
+    }
+
+    public void unregisterServant(String uri) throws CorbaHostException {
+        CorbanameURL details = CorbaHostUtils.getServiceDetails(uri);
+        try {
+            NamingContextExt namingCtx = getNamingContext(details.getNameService());
+            namingCtx.unbind(namingCtx.to_name(details.getName()));
+            removeURI(uri);
+        } catch (Exception e) {
+            handleException(e);
+        }
+    }
+
+    public Object lookup(String uri) throws CorbaHostException {
+        Object result = null;
+        try {
+            CorbanameURL url = new CorbanameURL(uri);
+            NamingContextExt context = getNamingContext(url.getNameService());
+            result = context.resolve_str(url.getName());
+        } catch (Exception e) {
+            // e.printStackTrace();
+            handleException(e);
+        }
+        if (result == null) {
+            throw new CorbaHostException(CorbaHostException.NO_SUCH_OBJECT);
+        }
+        return result;
+    }
+
+    // obtain ORB from environment
+    public void start() throws CorbaHostException {
+        Context ctx;
+        try {
+            ctx = new InitialContext();
+            orb = (ORB)PortableRemoteObject.narrow(ctx.lookup(ORB_NAME), org.omg.CORBA.ORB.class);
+        } catch (Exception e) {
+            throw new CorbaHostException(e);
+        }
+    }
+
+    // unregister registered servants
+    public void stop() {
+        // use copy because unregisterServant(...) method removes from
+        // registeredServants collection
+        List<String> rsCopy = new ArrayList<String>(registeredServants);
+        for (String servantURI : rsCopy) {
+            try {
+                unregisterServant(servantURI);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..3762550c01
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# 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. 

+

+org.apache.tuscany.sca.host.corba.jee.CorbaRuntimeModuleActivator

diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
new file mode 100644
index 0000000000..fd952a02c7
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
@@ -0,0 +1,208 @@
+/*
+ * 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.host.corba.jee.testing;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import javax.naming.Context;
+
+import org.apache.tuscany.sca.host.corba.CorbaHostException;
+import org.apache.tuscany.sca.host.corba.jee.JEECorbaHost;
+import org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface;
+import org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper;
+import org.apache.tuscany.sca.host.corba.jee.testing.servants.TestInterfaceServant;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
+import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * General tests for JEECorbaHost. Uses host-corba-jdk as mock for JEE
+ * environment ORB.
+ */
+public class JEECorbaHostTestCase {
+
+    public static final String LOCALHOST = "localhost";
+    public static final int DEFAULT_PORT = 11100;
+    private static JEECorbaHost host;
+    private static TransientNameServer server;
+    private static String factoryClassName;
+
+    private String createCorbanameURI(String name) {
+        return "corbaname:#" + name;
+    }
+
+    @BeforeClass
+    public static void start() {
+        try {
+            server = new TransientNameServer(LOCALHOST, DEFAULT_PORT, TransientNameService.DEFAULT_SERVICE_NAME);
+            Thread t = server.start();
+            if (t == null) {
+                fail("The naming server cannot be started");
+            }
+            factoryClassName = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
+            System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestInitialContextFactory.class.getName());
+            host = new JEECorbaHost();
+            host.start();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+
+    @AfterClass
+    public static void stop() {
+        server.stop();
+        if (factoryClassName != null) {
+            System.setProperty(Context.INITIAL_CONTEXT_FACTORY, factoryClassName);
+        } else {
+            System.clearProperty(Context.INITIAL_CONTEXT_FACTORY);
+        }
+    }
+
+    /**
+     * Tests registering and lookup CORBA services
+     */
+    @Test
+    public void test_registerServant() {
+        try {
+            String uri = createCorbanameURI("Nested/Test");
+            TestInterface servant = new TestInterfaceServant();
+            host.registerServant(uri, servant);
+            TestInterface ref = TestInterfaceHelper.narrow(host.lookup(uri));
+            assertEquals(2, ref.getInt(2));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests unregistering servants
+     */
+    @Test
+    public void test_unregisterServant() {
+        try {
+            String uri = createCorbanameURI("Unregistering/Test");
+            TestInterface servant = new TestInterfaceServant();
+
+            // creating and releasing using corbaname URI
+            host.registerServant(uri, servant);
+            host.unregisterServant(uri);
+            host.registerServant(uri, servant);
+            host.unregisterServant(uri);
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests situation when name is already registered
+     */
+    @Test
+    public void test_nameAlreadyRegistered() {
+        // test using URI
+        try {
+            TestInterface servant = new TestInterfaceServant();
+            String uri = createCorbanameURI("AlreadyRegisteredTest2");
+            host.registerServant(uri, servant);
+            host.registerServant(uri, servant);
+            fail();
+        } catch (CorbaHostException e) {
+            assertTrue(e.getMessage().equals(CorbaHostException.BINDING_IN_USE));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests getting non existing reference
+     */
+    @Test
+    public void test_getNonExistingObject() {
+        // try to fetch object with corbaname URI
+        try {
+            host.lookup(createCorbanameURI("NonExistingOne"));
+            fail();
+        } catch (CorbaHostException e) {
+            // The message is JDK-specific
+            // assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
+        } catch (Exception e) {
+            // e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests unregistering non existing reference
+     */
+    @Test
+    public void test_unregisterNonExistentObject() {
+        // test using URI
+        try {
+            String uri = createCorbanameURI("NonExistingReference1");
+            host.unregisterServant(uri);
+            fail();
+        } catch (CorbaHostException e) {
+            assertTrue(e.getMessage().equals(CorbaHostException.NO_SUCH_OBJECT));
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    /**
+     * Tests unregistering servants on host stop
+     */
+    @Test
+    public void test_unregisterOnStop() {
+        try {
+            String uri1 = createCorbanameURI("TempService1");
+            String uri2 = createCorbanameURI("TempService2");
+            JEECorbaHost innerHost = new JEECorbaHost();
+            innerHost.start();
+            TestInterfaceServant servant = new TestInterfaceServant();
+            innerHost.registerServant(uri1, servant);
+            innerHost.registerServant(uri2, servant);
+            innerHost.stop();
+            try {
+                innerHost.lookup(uri1);
+                fail();
+            } catch (CorbaHostException e) {
+                assertEquals(CorbaHostException.NO_SUCH_OBJECT, e.getMessage());
+            }
+            try {
+                innerHost.lookup(uri2);
+                fail();
+            } catch (CorbaHostException e) {
+                assertEquals(CorbaHostException.NO_SUCH_OBJECT, e.getMessage());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
new file mode 100644
index 0000000000..a0b9b7c514
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
@@ -0,0 +1,174 @@
+/*
+ * 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.host.corba.jee.testing;
+
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.apache.tuscany.sca.host.corba.jee.JEECorbaHost;
+import org.omg.CORBA.ORB;
+
+/**
+ * Mock implementation of javax.naming.Context interface.
+ */
+public class TestContext implements Context {
+
+    private ORB orb;
+
+    public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+        return null;
+    }
+
+    public void bind(Name name, Object obj) throws NamingException {
+
+    }
+
+    public void bind(String name, Object obj) throws NamingException {
+
+    }
+
+    public void close() throws NamingException {
+
+    }
+
+    public Name composeName(Name name, Name prefix) throws NamingException {
+        return null;
+    }
+
+    public String composeName(String name, String prefix) throws NamingException {
+        return null;
+    }
+
+    public Context createSubcontext(Name name) throws NamingException {
+        return null;
+    }
+
+    public Context createSubcontext(String name) throws NamingException {
+        return null;
+    }
+
+    public void destroySubcontext(Name name) throws NamingException {
+
+    }
+
+    public void destroySubcontext(String name) throws NamingException {
+
+    }
+
+    public Hashtable<?, ?> getEnvironment() throws NamingException {
+        return null;
+    }
+
+    public String getNameInNamespace() throws NamingException {
+        return null;
+    }
+
+    public NameParser getNameParser(Name name) throws NamingException {
+        return null;
+    }
+
+    public NameParser getNameParser(String name) throws NamingException {
+        return null;
+    }
+
+    public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+        return null;
+    }
+
+    public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+        return null;
+    }
+
+    public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+        return null;
+    }
+
+    public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+        return null;
+    }
+
+    public Object lookup(Name name) throws NamingException {
+        return null;
+    }
+
+    public Object lookup(String name) throws NamingException {
+        try {
+            if (name.equals(JEECorbaHost.ORB_NAME)) {
+                if (orb == null) {
+                    // get ORB which was spawned under host and port declared in
+                    // test class
+                    String[] args =
+                        {"-ORBInitialHost", JEECorbaHostTestCase.LOCALHOST, "-ORBInitialPort",
+                         "" + JEECorbaHostTestCase.DEFAULT_PORT};
+                    orb = ORB.init(args, null);
+                }
+            } else {
+                throw new NamingException("Unknown name: " + name);
+            }
+        } catch (Exception e) {
+            throw new NamingException(e.getMessage());
+        }
+        return orb;
+    }
+
+    public Object lookupLink(Name name) throws NamingException {
+        return null;
+    }
+
+    public Object lookupLink(String name) throws NamingException {
+        return null;
+    }
+
+    public void rebind(Name name, Object obj) throws NamingException {
+
+    }
+
+    public void rebind(String name, Object obj) throws NamingException {
+
+    }
+
+    public Object removeFromEnvironment(String propName) throws NamingException {
+        return null;
+    }
+
+    public void rename(Name oldName, Name newName) throws NamingException {
+
+    }
+
+    public void rename(String oldName, String newName) throws NamingException {
+
+    }
+
+    public void unbind(Name name) throws NamingException {
+
+    }
+
+    public void unbind(String name) throws NamingException {
+
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
new file mode 100644
index 0000000000..f480235fa8
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
@@ -0,0 +1,37 @@
+/*
+ * 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.host.corba.jee.testing;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+/**
+ * Factory for mock implementation of javax.naming.Context interface.
+ */
+public class TestInitialContextFactory implements InitialContextFactory {
+
+    public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+        return new TestContext();
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
new file mode 100644
index 0000000000..5bb43fbb98
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
@@ -0,0 +1,30 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+public interface TestInterface extends TestInterfaceOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity {
+} // interface TestInterface
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
new file mode 100644
index 0000000000..376a5bf2fa
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
@@ -0,0 +1,100 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+abstract public class TestInterfaceHelper {
+    private static String _id = "IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0";
+
+    public static void insert(org.omg.CORBA.Any a,
+                              org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface that) {
+        org.omg.CORBA.portable.OutputStream out = a.create_output_stream();
+        a.type(type());
+        write(out, that);
+        a.read_value(out.create_input_stream(), type());
+    }
+
+    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface extract(org.omg.CORBA.Any a) {
+        return read(a.create_input_stream());
+    }
+
+    private static org.omg.CORBA.TypeCode __typeCode = null;
+
+    synchronized public static org.omg.CORBA.TypeCode type() {
+        if (__typeCode == null) {
+            __typeCode =
+                org.omg.CORBA.ORB
+                    .init()
+                    .create_interface_tc(org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.id(),
+                                         "TestInterface");
+        }
+        return __typeCode;
+    }
+
+    public static String id() {
+        return _id;
+    }
+
+    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface read(org.omg.CORBA.portable.InputStream istream) {
+        return narrow(istream.read_Object(_TestInterfaceStub.class));
+    }
+
+    public static void write(org.omg.CORBA.portable.OutputStream ostream,
+                             org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface value) {
+        ostream.write_Object((org.omg.CORBA.Object)value);
+    }
+
+    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface narrow(org.omg.CORBA.Object obj) {
+        if (obj == null)
+            return null;
+        else if (obj instanceof org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)
+            return (org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)obj;
+        else if (!obj._is_a(id()))
+            throw new org.omg.CORBA.BAD_PARAM();
+        else {
+            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
+            org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub stub =
+                new org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub();
+            stub._set_delegate(delegate);
+            return stub;
+        }
+    }
+
+    public static org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface unchecked_narrow(org.omg.CORBA.Object obj) {
+        if (obj == null)
+            return null;
+        else if (obj instanceof org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)
+            return (org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface)obj;
+        else {
+            org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
+            org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub stub =
+                new org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceStub();
+            stub._set_delegate(delegate);
+            return stub;
+        }
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
new file mode 100644
index 0000000000..8aa2f59f71
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
@@ -0,0 +1,51 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+public final class TestInterfaceHolder implements org.omg.CORBA.portable.Streamable {
+    public org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface value = null;
+
+    public TestInterfaceHolder() {
+    }
+
+    public TestInterfaceHolder(org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface initialValue) {
+        value = initialValue;
+    }
+
+    public void _read(org.omg.CORBA.portable.InputStream i) {
+        value = org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.read(i);
+    }
+
+    public void _write(org.omg.CORBA.portable.OutputStream o) {
+        org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.write(o, value);
+    }
+
+    public org.omg.CORBA.TypeCode _type() {
+        return org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterfaceHelper.type();
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
new file mode 100644
index 0000000000..ca491c1b0e
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
@@ -0,0 +1,31 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+public interface TestInterfaceOperations {
+    int getInt(int arg);
+} // interface TestInterfaceOperations
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
new file mode 100644
index 0000000000..69795e0e25
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
@@ -0,0 +1,74 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+public abstract class _TestInterfaceImplBase extends org.omg.CORBA.portable.ObjectImpl implements
+    org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface, org.omg.CORBA.portable.InvokeHandler {
+
+    // Constructors
+    public _TestInterfaceImplBase() {
+    }
+
+    private static java.util.Hashtable _methods = new java.util.Hashtable();
+    static {
+        _methods.put("getInt", new java.lang.Integer(0));
+    }
+
+    public org.omg.CORBA.portable.OutputStream _invoke(String $method,
+                                                       org.omg.CORBA.portable.InputStream in,
+                                                       org.omg.CORBA.portable.ResponseHandler $rh) {
+        org.omg.CORBA.portable.OutputStream out = null;
+        java.lang.Integer __method = (java.lang.Integer)_methods.get($method);
+        if (__method == null)
+            throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+
+        switch (__method.intValue()) {
+            case 0: // org/apache/tuscany/sca/host/corba/testing/general/TestInterface/getInt
+            {
+                int arg = in.read_long();
+                int $result = (int)0;
+                $result = this.getInt(arg);
+                out = $rh.createReply();
+                out.write_long($result);
+                break;
+            }
+
+            default:
+                throw new org.omg.CORBA.BAD_OPERATION(0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
+        }
+
+        return out;
+    } // _invoke
+
+    // Type-specific CORBA::Object operations
+    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
+
+    public String[] _ids() {
+        return (String[])__ids.clone();
+    }
+
+} // class _TestInterfaceImplBase
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
new file mode 100644
index 0000000000..d806a25c6a
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
@@ -0,0 +1,73 @@
+/*
+ * 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.host.corba.jee.testing.general;
+
+/**
+* org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from general_tests.idl
+* roda, 25 czerwiec 2008 16:19:44 CEST
+*/
+
+public class _TestInterfaceStub extends org.omg.CORBA.portable.ObjectImpl implements
+    org.apache.tuscany.sca.host.corba.jee.testing.general.TestInterface {
+
+    public int getInt(int arg) {
+        org.omg.CORBA.portable.InputStream $in = null;
+        try {
+            org.omg.CORBA.portable.OutputStream $out = _request("getInt", true);
+            $out.write_long(arg);
+            $in = _invoke($out);
+            int $result = $in.read_long();
+            return $result;
+        } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+            $in = $ex.getInputStream();
+            String _id = $ex.getId();
+            throw new org.omg.CORBA.MARSHAL(_id);
+        } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+            return getInt(arg);
+        } finally {
+            _releaseReply($in);
+        }
+    } // getInt
+
+    // Type-specific CORBA::Object operations
+    private static String[] __ids = {"IDL:org/apache/tuscany/sca/host/corba/testing/general/TestInterface:1.0"};
+
+    public String[] _ids() {
+        return (String[])__ids.clone();
+    }
+
+    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException {
+        String str = s.readUTF();
+        String[] args = null;
+        java.util.Properties props = null;
+        org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init(args, props).string_to_object(str);
+        org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate();
+        _set_delegate(delegate);
+    }
+
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+        String[] args = null;
+        java.util.Properties props = null;
+        String str = org.omg.CORBA.ORB.init(args, props).object_to_string(this);
+        s.writeUTF(str);
+    }
+} // class _TestInterfaceStub
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
new file mode 100644
index 0000000000..6195f3af9c
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
@@ -0,0 +1,35 @@
+/*
+ * 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.host.corba.jee.testing.servants;
+
+import org.apache.tuscany.sca.host.corba.jee.testing.general._TestInterfaceImplBase;
+
+/**
+ * Testing servant 
+ */
+public class TestInterfaceServant extends _TestInterfaceImplBase {
+
+    private static final long serialVersionUID = 1L;
+
+    public int getInt(int arg) {
+        return arg;
+    }
+
+}
diff --git a/sca-java-1.x/trunk/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/resources/general.idl
new file mode 100644
index 0000000000..9194a37334
--- /dev/null
+++ b/sca-java-1.x/trunk/modules/host-corba-jee/src/test/resources/general.idl
@@ -0,0 +1,45 @@
+/*

+ * 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.    

+ */

+

+/*

+ * compile by

+ * idlj -fall -oldImplBase general.idl

+ */

+ 

+module org {

+	module apache {

+		module tuscany {

+			module sca {

+				module host {

+					module corba {

+						module jee {

+							module testing {

+								module general {

+									interface TestInterface {

+										long getInt(in long arg);

+									};

+								};

+							};

+						};

+					};

+				};

+			};

+		};

+	};

+};