You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/05 05:39:58 UTC
svn commit: r1227481 - in /openejb/trunk/openejb: ./
container/openejb-core/src/main/java/org/apache/openejb/client/
container/openejb-core/src/main/java/org/apache/openejb/core/
container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ ...
Author: dblevins
Date: Thu Jan 5 04:39:55 2012
New Revision: 1227481
URL: http://svn.apache.org/viewvc?rev=1227481&view=rev
Log:
svn merge -r 1227466:1227467 https://svn.apache.org/repos/asf/openejb/branches/openejb-4.0.0-beta-2
http://svn.apache.org/viewvc?view=revision&revision=1227467
------------------------------------------------------------------------
r1227467 | dblevins | 2012-01-04 19:31:12 -0800 (Wed, 04 Jan 2012) | 3 lines
eliminated the separate module for the backwards compatible org.openejb.client.LocalInitialContextFactory
Put the new LocalInitialContextFactory right in org.apache.openejb.core so the package matches the module name
------------------------------------------------------------------------
Added:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/client/
- copied from r1227467, openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/main/java/org/apache/openejb/client/
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
- copied unchanged from r1227467, openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
- copied unchanged from r1227467, openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContextFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
- copied unchanged from r1227467, openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java
- copied unchanged from r1227467, openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java
Removed:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/localclient/LocalInitialContext.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/localclient/LocalInitialContextFactory.java
openejb/trunk/openejb/utils/openejb-core-legacy-client/
Modified:
openejb/trunk/openejb/ (props changed)
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java
openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf/ (props changed)
openejb/trunk/openejb/container/openejb-junit/src/main/resources/META-INF/default-openejb-test-config.properties
openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
openejb/trunk/openejb/container/openejb-junit/src/test/resources/META-INF/test-config.properties
openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
openejb/trunk/openejb/examples/application-composer/ (props changed)
openejb/trunk/openejb/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
openejb/trunk/openejb/examples/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java
openejb/trunk/openejb/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
openejb/trunk/openejb/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
openejb/trunk/openejb/examples/quartz-app/quartz-beans/src/test/java/org/superbiz/quartz/QuartzMdbTest.java
openejb/trunk/openejb/examples/simple-cmp2/src/test/java/org/superbiz/cmp2/MoviesTest.java
openejb/trunk/openejb/examples/simple-stateless-with-descriptor/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
openejb/trunk/openejb/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java
openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java
openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties
openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java
openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java
openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java
openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java
openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
openejb/trunk/openejb/src/ (props changed)
openejb/trunk/openejb/utils/pom.xml
Propchange: openejb/trunk/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,3 +1,4 @@
/openejb/branches/openejb-3.1.1:779593
/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
+/openejb/branches/openejb-4.0.0-beta-2:1227467
/openejb/branches/openejb-jcdi:984659-985270
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Thu Jan 5 04:39:55 2012
@@ -29,7 +29,7 @@ import org.apache.openejb.spi.ContainerS
import org.apache.openejb.spi.SecurityService;
/**
- * @deprecated Use org.apache.openejb.localclient.LocalInitialContextFactory
+ * @deprecated Use org.apache.openejb.core.LocalInitialContextFactory
*/
public class InitContextFactory implements javax.naming.spi.InitialContextFactory {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java Thu Jan 5 04:39:55 2012
@@ -20,12 +20,12 @@ import java.util.Hashtable;
import javax.naming.Context;
-import org.apache.openejb.localclient.LocalInitialContext;
+import org.apache.openejb.core.LocalInitialContext;
/**
* @version $Rev$ $Date$
*/
-public class LocalInitialContextFactory extends org.apache.openejb.localclient.LocalInitialContextFactory {
+public class LocalInitialContextFactory extends org.apache.openejb.core.LocalInitialContextFactory {
public Context getInitialContext(Hashtable env) throws javax.naming.NamingException {
init(env);
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ServiceManagerProxy.java Thu Jan 5 04:39:55 2012
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.localclient.LocalInitialContext;
+import org.apache.openejb.core.LocalInitialContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java Thu Jan 5 04:39:55 2012
@@ -22,7 +22,7 @@ import javax.naming.InitialContext;
import javax.naming.Context;
import java.util.Properties;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
/**
* @version $Rev$ $Date$
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java Thu Jan 5 04:39:55 2012
@@ -18,8 +18,7 @@ package org.apache.openejb.assembler.cla
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.EjbModule;
@@ -30,15 +29,12 @@ import org.junit.Before;
import org.junit.Test;
import javax.annotation.Resource;
-import javax.ejb.EJB;
import javax.ejb.Singleton;
-import javax.inject.Inject;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
import java.io.IOException;
-import java.net.URL;
import java.util.Properties;
import static junit.framework.Assert.assertEquals;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java Thu Jan 5 04:39:55 2012
@@ -17,7 +17,7 @@
package org.apache.openejb.assembler.classic;
import junit.framework.TestCase;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.loader.JarLocation;
import org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean;
Propchange: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,3 +1,4 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
+/openejb/branches/openejb-4.0.0-beta-2/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:1227467
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java Thu Jan 5 04:39:55 2012
@@ -62,7 +62,7 @@ public class JndiNameFormatTest extends
deploy("{ejbName}/{interfaceType.annotationName.lc}");
Properties p = new Properties();
- p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext context = new InitialContext(p);
Echo echo = (Echo) context.lookup("EchoImpl/remote");
@@ -75,7 +75,7 @@ public class JndiNameFormatTest extends
deploy("{ejbName}/{interfaceType.annotationName.uc}");
Properties p = new Properties();
- p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext context = new InitialContext(p);
Echo echo = (Echo) context.lookup("EchoImpl/REMOTE");
@@ -88,7 +88,7 @@ public class JndiNameFormatTest extends
deploy("{ejbName}/{interfaceType.annotationName.cc}");
Properties p = new Properties();
- p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext context = new InitialContext(p);
Echo echo = (Echo) context.lookup("EchoImpl/Remote");
@@ -101,7 +101,7 @@ public class JndiNameFormatTest extends
deploy("{ejbName.lc}/{interfaceType.annotationName.uc}");
Properties p = new Properties();
- p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext context = new InitialContext(p);
Echo echo = (Echo) context.lookup("echoimpl/REMOTE");
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java Thu Jan 5 04:39:55 2012
@@ -17,37 +17,20 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
-import junit.framework.Assert;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.jpa.unit.Persistence;
import javax.ejb.Local;
import javax.ejb.Remote;
-import javax.ejb.EJB;
import javax.jws.WebService;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-import javax.jms.ConnectionFactory;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
-import javax.transaction.UserTransaction;
import java.io.IOException;
import java.io.Serializable;
import java.util.Properties;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientSubclassTest.java Thu Jan 5 04:39:55 2012
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.config;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import javax.naming.InitialContext;
import java.util.Properties;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java Thu Jan 5 04:39:55 2012
@@ -17,12 +17,11 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
-import junit.framework.Assert;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.jpa.unit.Persistence;
@@ -35,14 +34,10 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.annotation.Resource;
import javax.sql.DataSource;
-import javax.jms.ConnectionFactory;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
import javax.jms.JMSException;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.MessageProducer;
-import javax.jms.Queue;
import javax.persistence.PersistenceUnit;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContext;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java Thu Jan 5 04:39:55 2012
@@ -17,7 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java Thu Jan 5 04:39:55 2012
@@ -23,11 +23,11 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
import javax.ejb.Local;
import javax.ejb.Remote;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/naming/OpenejbLookupTest.java Thu Jan 5 04:39:55 2012
@@ -20,13 +20,12 @@ import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import javax.naming.*;
-import javax.naming.NamingException;
import javax.transaction.TransactionManager;
import java.util.Properties;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java Thu Jan 5 04:39:55 2012
@@ -18,7 +18,7 @@ package org.apache.openejb.core.security
import junit.framework.TestCase;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java Thu Jan 5 04:39:55 2012
@@ -31,7 +31,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.ConcurrentMethod;
import org.apache.openejb.jee.EjbJar;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java Thu Jan 5 04:39:55 2012
@@ -32,7 +32,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.ConcurrentMethod;
import org.apache.openejb.jee.EjbJar;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java Thu Jan 5 04:39:55 2012
@@ -44,9 +44,8 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.core.stateful.StatefulInterceptorTest.Call;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Interceptor;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java Thu Jan 5 04:39:55 2012
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatefulBean;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java Thu Jan 5 04:39:55 2012
@@ -30,7 +30,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatefulBean;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java Thu Jan 5 04:39:55 2012
@@ -35,10 +35,10 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.StatefulSessionContainerInfo;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java Thu Jan 5 04:39:55 2012
@@ -45,7 +45,7 @@ import org.apache.openejb.assembler.clas
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.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.EjbModule;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java Thu Jan 5 04:39:55 2012
@@ -37,7 +37,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.NamedMethod;
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java Thu Jan 5 04:39:55 2012
@@ -39,7 +39,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.AssemblyDescriptor;
import org.apache.openejb.jee.EjbJar;
Propchange: openejb/trunk/openejb/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,4 +1,5 @@
/geronimo/server/branches/2.2/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:832538,885058
/geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792
/geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507
+/openejb/branches/openejb-4.0.0-beta-2/container/openejb-jee/src/test/resources/jsf:1227467
/openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270
Modified: openejb/trunk/openejb/container/openejb-junit/src/main/resources/META-INF/default-openejb-test-config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-junit/src/main/resources/META-INF/default-openejb-test-config.properties?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-junit/src/main/resources/META-INF/default-openejb-test-config.properties (original)
+++ openejb/trunk/openejb/container/openejb-junit/src/main/resources/META-INF/default-openejb-test-config.properties Thu Jan 5 04:39:55 2012
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory
+java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory
org.apache.openejb.junit.default-config=true
\ No newline at end of file
Modified: openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java (original)
+++ openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java Thu Jan 5 04:39:55 2012
@@ -31,7 +31,7 @@ import java.util.Hashtable;
@RunWith(OpenEjbRunner.class)
@ContextConfig(
properties = {
- @Property("java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory"),
+ @Property("java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory"),
@Property("junit.test-property=Test String from Properties"),
@Property("junit.test-empty-property="),
@Property("junit.test-null-property"),
Modified: openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java (original)
+++ openejb/trunk/openejb/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java Thu Jan 5 04:39:55 2012
@@ -46,7 +46,7 @@ public class TestMethodConfigProperties
@Test
@ContextConfig(
properties = {
- @Property("java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory"),
+ @Property("java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory"),
@Property(CHECK_PROPERTY + "=Test String from Properties")
}
)
Modified: openejb/trunk/openejb/container/openejb-junit/src/test/resources/META-INF/test-config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-junit/src/test/resources/META-INF/test-config.properties?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-junit/src/test/resources/META-INF/test-config.properties (original)
+++ openejb/trunk/openejb/container/openejb-junit/src/test/resources/META-INF/test-config.properties Thu Jan 5 04:39:55 2012
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory
+java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory
junit.test-property=Test String
junit.test-property-override=Original Value
junit.test-property-override2=Original Value 2
Propchange: openejb/trunk/openejb/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,3 +1,4 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
+/openejb/branches/openejb-4.0.0-beta-2/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:1227467
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Propchange: openejb/trunk/openejb/examples/application-composer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,2 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/application-composer:779593
+/openejb/branches/openejb-4.0.0-beta-2/examples/application-composer:1227467
/openejb/trunk/openejb3/examples/application-composer:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
Modified: openejb/trunk/openejb/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java (original)
+++ openejb/trunk/openejb/examples/applicationexception/src/test/java/org/superbiz/appexception/ThrowBusinessExceptionImplTest.java Thu Jan 5 04:39:55 2012
@@ -35,7 +35,7 @@ public class ThrowBusinessExceptionImplT
@Before
public void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
initialContext = new InitialContext(properties);
}
Modified: openejb/trunk/openejb/examples/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java (original)
+++ openejb/trunk/openejb/examples/dynamic-datasource-routing/src/test/java/org/superbiz/dynamicdatasourcerouting/DynamicDataSourceTest.java Thu Jan 5 04:39:55 2012
@@ -16,7 +16,7 @@
*/
package org.superbiz.dynamicdatasourcerouting;
-import org.apache.openejb.localclient.LocalInitialContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.resource.jdbc.Router;
import org.junit.Test;
Modified: openejb/trunk/openejb/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java (original)
+++ openejb/trunk/openejb/examples/ear-testing/business-logic/src/test/java/org/superbiz/logic/MoviesTest.java Thu Jan 5 04:39:55 2012
@@ -30,7 +30,7 @@ public class MoviesTest extends TestCase
public void test() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put("openejb.deployments.classpath.ear", "true");
Modified: openejb/trunk/openejb/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java (original)
+++ openejb/trunk/openejb/examples/helloworld-weblogic/src/test/java/org/superbiz/hello/HelloTest.java Thu Jan 5 04:39:55 2012
@@ -29,7 +29,7 @@ public class HelloTest extends TestCase
public void test() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext initialContext = new InitialContext(properties);
HelloEjbLocalHome localHome = (HelloEjbLocalHome) initialContext.lookup("MyHello");
Modified: openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java (original)
+++ openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/FullyInterceptedTest.java Thu Jan 5 04:39:55 2012
@@ -37,7 +37,7 @@ public class FullyInterceptedTest extend
@Before
public void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
initCtx = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java (original)
+++ openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/MethodLevelInterceptorOnlyTest.java Thu Jan 5 04:39:55 2012
@@ -35,7 +35,7 @@ public class MethodLevelInterceptorOnlyT
@Before
public void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
initCtx = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java (original)
+++ openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/SecondStatelessInterceptedTest.java Thu Jan 5 04:39:55 2012
@@ -36,7 +36,7 @@ public class SecondStatelessInterceptedT
@Before
public void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
initCtx = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java (original)
+++ openejb/trunk/openejb/examples/interceptors/src/test/java/org/superbiz/interceptors/ThirdSLSBeanTest.java Thu Jan 5 04:39:55 2012
@@ -35,7 +35,7 @@ public class ThirdSLSBeanTest extends Te
@Before
public void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
initCtx = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/quartz-app/quartz-beans/src/test/java/org/superbiz/quartz/QuartzMdbTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/quartz-app/quartz-beans/src/test/java/org/superbiz/quartz/QuartzMdbTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/quartz-app/quartz-beans/src/test/java/org/superbiz/quartz/QuartzMdbTest.java (original)
+++ openejb/trunk/openejb/examples/quartz-app/quartz-beans/src/test/java/org/superbiz/quartz/QuartzMdbTest.java Thu Jan 5 04:39:55 2012
@@ -35,7 +35,7 @@ public class QuartzMdbTest {
System.setProperty(OutputGeneratedDescriptors.OUTPUT_DESCRIPTORS, "false"); // just to avoid to dump files in /tmp
if (null == initialContext) {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
initialContext = new InitialContext(properties);
}
Modified: openejb/trunk/openejb/examples/simple-cmp2/src/test/java/org/superbiz/cmp2/MoviesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-cmp2/src/test/java/org/superbiz/cmp2/MoviesTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-cmp2/src/test/java/org/superbiz/cmp2/MoviesTest.java (original)
+++ openejb/trunk/openejb/examples/simple-cmp2/src/test/java/org/superbiz/cmp2/MoviesTest.java Thu Jan 5 04:39:55 2012
@@ -30,7 +30,7 @@ public class MoviesTest extends TestCase
public void test() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put("movieDatabase", "new://Resource?type=DataSource");
p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
Modified: openejb/trunk/openejb/examples/simple-stateless-with-descriptor/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-stateless-with-descriptor/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-stateless-with-descriptor/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/simple-stateless-with-descriptor/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Jan 5 04:39:55 2012
@@ -29,7 +29,7 @@ public class CalculatorTest extends Test
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
initialContext = new InitialContext(properties);
}
Modified: openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/simple-webservice/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Jan 5 04:39:55 2012
@@ -45,7 +45,7 @@ public class CalculatorTest extends Test
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
initialContext = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java (original)
+++ openejb/trunk/openejb/examples/telephone-stateful/src/test/java/org/superbiz/telephone/TelephoneTest.java Thu Jan 5 04:39:55 2012
@@ -31,7 +31,7 @@ public class TelephoneTest extends TestC
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
// Uncomment these properties to change the defaults
//properties.setProperty("ejbd.port", "4202");
@@ -53,7 +53,7 @@ public class TelephoneTest extends TestC
public void testTalkOverLocalNetwork() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
InitialContext localContext = new InitialContext(properties);
Telephone telephone = (Telephone) localContext.lookup("TelephoneBeanRemote");
Modified: openejb/trunk/openejb/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java (original)
+++ openejb/trunk/openejb/examples/testing-security-2/src/test/java/org/superbiz/injection/secure/MovieTest.java Thu Jan 5 04:39:55 2012
@@ -47,7 +47,7 @@ public class MovieTest extends TestCase
public void testAsManager() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put(Context.SECURITY_PRINCIPAL, "jane");
p.put(Context.SECURITY_CREDENTIALS, "waterfall");
@@ -73,7 +73,7 @@ public class MovieTest extends TestCase
public void testAsEmployee() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put(Context.SECURITY_PRINCIPAL, "joe");
p.put(Context.SECURITY_CREDENTIALS, "cool");
Modified: openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java (original)
+++ openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java Thu Jan 5 04:39:55 2012
@@ -43,7 +43,7 @@ public class MoviesTest extends TestCase
public void setUp() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put("movieDatabase", "new://Resource?type=DataSource");
p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
Modified: openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties (original)
+++ openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties Thu Jan 5 04:39:55 2012
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory
+java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory
Default\ JMS\ Resource\ Adapter=new://Resource?type=ActiveMQResourceAdapter
Default\ JMS\ Resource\ Adapter.BrokerXmlConfig=broker:vm://localhost
Default\ JMS\ Resource\ Adapter.ServerUrl=tcp://localhost:61616
Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java (original)
+++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java Thu Jan 5 04:39:55 2012
@@ -68,7 +68,7 @@ public class AddUser {
UserService service = null;
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY,
- "org.apache.openejb.localclient.LocalInitialContextFactory");
+ "org.apache.openejb.core.LocalInitialContextFactory");
Context ctx = new InitialContext(props);
service = (UserService) ctx.lookup("UserServiceImplLocal");
service.add(new User(id, firstName, lastName));
Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java (original)
+++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java Thu Jan 5 04:39:55 2012
@@ -57,7 +57,7 @@ public class FindUser {
UserService service = null;
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY,
- "org.apache.openejb.localclient.LocalInitialContextFactory");
+ "org.apache.openejb.core.LocalInitialContextFactory");
Context ctx = new InitialContext(props);
service = (UserService) ctx.lookup("UserServiceImplLocal");
this.user = service.find(id);
Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java (original)
+++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java Thu Jan 5 04:39:55 2012
@@ -58,7 +58,7 @@ public class ListAllUsers {
UserService service = null;
Properties props = new Properties();
props.put(Context.INITIAL_CONTEXT_FACTORY,
- "org.apache.openejb.localclient.LocalInitialContextFactory");
+ "org.apache.openejb.core.LocalInitialContextFactory");
Context ctx = new InitialContext(props);
service = (UserService) ctx.lookup("UserServiceImplLocal");
this.users = service.findAll();
Modified: openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java Thu Jan 5 04:39:55 2012
@@ -38,7 +38,7 @@ public class AttachmentTest extends Test
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
initialContext = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java Thu Jan 5 04:39:55 2012
@@ -35,7 +35,7 @@ public class InheritanceTest extends Tes
protected void setUp() throws Exception {
Properties p = new Properties();
- p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
p.put("wakeBoardDatabase", "new://Resource?type=DataSource");
p.put("wakeBoardDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
p.put("wakeBoardDatabase.JdbcUrl", "jdbc:hsqldb:mem:wakeBoarddb");
Modified: openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Jan 5 04:39:55 2012
@@ -33,7 +33,7 @@ public class CalculatorTest extends Test
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
initialContext = new InitialContext(properties);
Modified: openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original)
+++ openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Jan 5 04:39:55 2012
@@ -47,7 +47,7 @@ public class CalculatorTest extends Test
//START SNIPPET: setup
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
new InitialContext(properties);
Modified: openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java Thu Jan 5 04:39:55 2012
@@ -34,7 +34,7 @@ public class IvmTestServer implements Te
properties = props;
try{
- props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
Properties p = new Properties();
p.putAll(props);
p.put("openejb.loader", "embed");
Modified: openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java Thu Jan 5 04:39:55 2012
@@ -41,7 +41,7 @@ public class CxfJaxWsProviderTest extend
protected void setUp() throws Exception {
Properties properties = new Properties();
- properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+ properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
initialContext = new InitialContext(properties);
Modified: openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java (original)
+++ openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java Thu Jan 5 04:39:55 2012
@@ -99,7 +99,7 @@ public class UberInterfaceTest extends T
{ // local invoke
Properties props = new Properties();
- props.put("java.naming.factory.initial", "org.apache.openejb.localclient.LocalInitialContextFactory");
+ props.put("java.naming.factory.initial", "org.apache.openejb.core.LocalInitialContextFactory");
Context context = new InitialContext(props);
Everything local = (Everything) context.lookup("SuperBeanLocal");
Propchange: openejb/trunk/openejb/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 5 04:39:55 2012
@@ -1,2 +1,3 @@
/openejb/branches/openejb-3.1.1/src:779593
+/openejb/branches/openejb-4.0.0-beta-2/src:1227467
/openejb/trunk/openejb3/src:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528
Modified: openejb/trunk/openejb/utils/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/pom.xml?rev=1227481&r1=1227480&r2=1227481&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/pom.xml (original)
+++ openejb/trunk/openejb/utils/pom.xml Thu Jan 5 04:39:55 2012
@@ -32,6 +32,5 @@
<module>openejb-logging</module>
<module>openejb-spring</module>
<module>openejb-core-hibernate</module>
- <module>openejb-core-legacy-client</module>
</modules>
</project>