svn commit: r660759 - in /incubator/tuscany/java/sca/modules/host-openejb/src: main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java

[jsdelfino]

Author: jsdelfino
Date: Tue May 27 16:19:23 2008
New Revision: 660759

URL: http://svn.apache.org/viewvc?rev=660759&view=rev
Log:
Configured EJB server to use remote factory. Use the correct Assembler instance 
instead of creating a new one.

Modified:
    
incubator/tuscany/java/sca/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
    
incubator/tuscany/java/sca/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java

Modified: 
incubator/tuscany/java/sca/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java?rev=660759&r1=660758&r2=660759&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
 Tue May 27 16:19:23 2008
@@ -3,15 +3,13 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import javax.naming.Context;
 import javax.naming.NamingException;
 
 import org.apache.openejb.OpenEJB;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
 import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.core.ServerFederation;
 import org.apache.openejb.jee.EjbJar;
@@ -80,21 +78,20 @@
     private void start() throws EJBRegistrationException {
         try {
             Properties properties = new Properties();
+            properties.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.RemoteInitialContextFactory");
+            properties.put(Context.PROVIDER_URL, "ejbd://localhost:2888");
             SystemInstance.init(properties);
             
             ejbServer = new EjbServer();
             SystemInstance.get().setComponent(EjbServer.class, ejbServer);
             OpenEJB.init(properties, new ServerFederation());
             ejbServer.init(properties);
-
+            
             serviceDaemon = new ServiceDaemon(ejbServer, 2888, "localhost");
             serviceDaemon.start();
             
             config = new ConfigurationFactory();
-            assembler = new Assembler();
-            
assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
-            
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
-            
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+            assembler = 
(Assembler)SystemInstance.get().getComponent(org.apache.openejb.spi.Assembler.class);
 
             // containers
             StatelessSessionContainerInfo statelessContainerInfo = 
config.configureService(StatelessSessionContainerInfo.class);

Modified: 
incubator/tuscany/java/sca/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java?rev=660759&r1=660758&r2=660759&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
 Tue May 27 16:19:23 2008
@@ -25,7 +25,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.openejb.core.ivm.naming.InitContextFactory;
 import org.apache.tuscany.sca.host.ejb.EJBSessionBean;
 
 /**
@@ -72,9 +71,9 @@
         server.addSessionBean("TestBean", new EJBSessionBean(TestImpl.class, 
TestRemote.class));
 
         Properties properties = new Properties(System.getProperties());
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
InitContextFactory.class.getName());
-        //properties.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.RemoteInitialContextFactory");
-        //properties.put(Context.PROVIDER_URL, "ejbd://localhost:2888");
+        //properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, 
InitContextFactory.class.getName());
+        properties.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.RemoteInitialContextFactory");
+        properties.put(Context.PROVIDER_URL, "ejbd://localhost:2888");
         InitialContext ctx = new InitialContext(properties);
         Object object = ctx.lookup("TestBeanRemote");
         assertTrue(object instanceof TestRemote);