You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/12/03 02:22:46 UTC
svn commit: r481685 - in /incubator/openejb/trunk/openejb3: ./
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/
container/openejb-core/src/main/java/org/apache/openejb/core/
container/openejb-...
Author: dain
Date: Sat Dec 2 17:22:45 2006
New Revision: 481685
URL: http://svn.apache.org/viewvc?view=rev&rev=481685
Log:
Re-enabled the cmp tests
Simplified the Castor container configuration by removing jdbc data that can be retrieved from jndi
Upgraded to Castor 1.0.5
Temporarily converted back to Instant DB since derby seems to cause the iTests to fail
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/LocalCastorContainer.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
incubator/openejb/trunk/openejb3/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Sat Dec 2 17:22:45 2006
@@ -114,6 +114,10 @@
</build>
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
<version>${pom.version}</version>
@@ -130,7 +134,7 @@
</dependency>
<!-- End ActiveMQ -->
<dependency>
- <groupId>castor</groupId>
+ <groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
</dependency>
<!-- these are for castor, should be added to its pom.xml -->
@@ -177,10 +181,6 @@
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
</dependency>
@@ -239,6 +239,11 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java Sat Dec 2 17:22:45 2006
@@ -21,7 +21,6 @@
import org.exolab.castor.jdo.OQLQuery;
import org.exolab.castor.jdo.QueryResults;
import org.exolab.castor.mapping.AccessMode;
-import org.exolab.castor.mapping.MappingException;
import org.exolab.castor.persist.spi.CallbackInterceptor;
import org.exolab.castor.persist.spi.Complex;
import org.exolab.castor.persist.spi.InstanceFactory;
@@ -30,6 +29,7 @@
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.RpcContainer;
+import org.apache.openejb.resource.jdbc.JdbcConnectionFactory;
import org.apache.openejb.core.EnvProps;
import org.apache.openejb.core.Operations;
import org.apache.openejb.core.ThreadContext;
@@ -52,6 +52,7 @@
import javax.transaction.Status;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
+import javax.naming.InitialContext;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -65,14 +66,13 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.Enumeration;
-import java.util.List;
import java.net.URL;
import java.net.MalformedURLException;
/**
* @org.apache.xbean.XBean element="castorCmp11Container"
*/
-public class CastorCMP11_EntityContainer implements RpcContainer, TransactionContainer, CallbackInterceptor, InstanceFactory {
+public class CastorCMP11_EntityContainer implements RpcContainer, TransactionContainer, CallbackInterceptor, InstanceFactory, LocalCastorContainer {
/*
* Bean instances that are currently in use are placed in the txReadyPoolMap indexed
@@ -145,8 +145,9 @@
private JDOManager localJdoManager;
private JDOManager globalJdoManager;
- public CastorCMP11_EntityContainer(Object id, TransactionManager transactionManager, SecurityService securityService, HashMap registry, int poolSize, String engine, String connectorName, String jdbcDriver, String jdbcUrl, String userName, String password) throws OpenEJBException {
- init(id, transactionManager, securityService, registry, poolSize, engine, connectorName, jdbcDriver, jdbcUrl, userName, password);
+ public CastorCMP11_EntityContainer(Object id, TransactionManager transactionManager, SecurityService securityService, HashMap registry, int poolSize, String engine, String connectorName) throws OpenEJBException {
+ init(id, transactionManager, securityService, registry, poolSize, engine, connectorName);
+// throw new UnsupportedOperationException("DISABLED");
// init(id, transactionManager, securityService, registry, poolsize, "instantdb", "Default JDBC Database", "org.enhydra.instantdb.jdbc.idbDriver", "jdbc:idb:conf/default.idb_database.conf", "Admin", "pass");
}
@@ -159,10 +160,10 @@
int poolsize = safeProps.getPropertyAsInt(EnvProps.IM_POOL_SIZE, 100);
- init(id, transactionManager, securityService, registry, poolsize, "instantdb", "java:openejb/connector/Default JDBC Database", "org.enhydra.instantdb.jdbc.idbDriver", "jdbc:idb:conf/default.idb_database.conf", "Admin", "pass");
+ init(id, transactionManager, securityService, registry, poolsize, "instantdb", "java:openejb/connector/Default JDBC Database");
}
- private void init(Object id, TransactionManager transactionManager, SecurityService securityService, HashMap registry, int poolsize, String engine, String resourceName, String driverClassName, String driverUrl, String username, String password) throws OpenEJBException {
+ private void init(Object id, TransactionManager transactionManager, SecurityService securityService, HashMap registry, int poolsize, String engine, String resourceName) throws OpenEJBException {
this.transactionManager = transactionManager;
this.securityService = securityService;
this.containerID = id;
@@ -242,18 +243,24 @@
jdoManagerBuilder.addMapping(url);
}
- try {
- globalJdoManager = jdoManagerBuilder.buildGlobalJDOManager("java:openejb/connector/"+resourceName);
- globalJdoManager.setDatabasePooling(true);
- globalJdoManager.setCallbackInterceptor(this);
- globalJdoManager.setInstanceFactory(this);
-
- localJdoManager = jdoManagerBuilder.buildLocalJDOManager(driverClassName, driverUrl, username, password);
- localJdoManager.setCallbackInterceptor(this);
- localJdoManager.setInstanceFactory(this);
- } catch (MappingException e) {
- e.printStackTrace();
+ String jdbcName = "java:openejb/connector/" + resourceName;
+ JdbcConnectionFactory connectionFactory = (JdbcConnectionFactory) new InitialContext().lookup(jdbcName);
+ if (connectionFactory == null) {
+ throw new OpenEJBException(jdbcName + " does not exist");
}
+
+ globalJdoManager = jdoManagerBuilder.buildGlobalJDOManager(jdbcName);
+ globalJdoManager.setDatabasePooling(true);
+ globalJdoManager.setCallbackInterceptor(this);
+ globalJdoManager.setInstanceFactory(this);
+
+ localJdoManager = jdoManagerBuilder.buildLocalJDOManager(
+ connectionFactory.getJdbcDriver(),
+ connectionFactory.getJdbcUrl(),
+ connectionFactory.getDefaultUserName(),
+ connectionFactory.getDefaultPassword());
+ localJdoManager.setCallbackInterceptor(this);
+ localJdoManager.setInstanceFactory(this);
} catch (Exception e) {
e.printStackTrace();
throw new OpenEJBException("Unable to construct the Castor JDOManager objects: "+e.getClass().getName()+": "+e.getMessage(), e);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEntityTxPolicy.java Sat Dec 2 17:22:45 2006
@@ -29,26 +29,25 @@
public class CastorCmpEntityTxPolicy extends org.apache.openejb.core.transaction.TransactionPolicy {
protected TransactionPolicy policy;
- protected CastorCMP11_EntityContainer cmpContainer;
- protected JDOManager jdo_ForLocalTransaction = null;
+ protected final JDOManager jdo_ForLocalTransaction;
public CastorCmpEntityTxPolicy(TransactionPolicy policy) {
this.policy = policy;
this.container = policy.getContainer();
this.policyType = policy.policyType;
- this.cmpContainer = getCastorContainer(container);
+ LocalCastorContainer cmpContainer = getCastorContainer(container);
this.jdo_ForLocalTransaction = cmpContainer.getLocalTxJDO();
}
- private CastorCMP11_EntityContainer getCastorContainer(TransactionContainer container) {
+ private LocalCastorContainer getCastorContainer(TransactionContainer container) {
if (container instanceof RpcContainerWrapper) {
RpcContainerWrapper wrapper = (RpcContainerWrapper) container;
return getCastorContainer((TransactionContainer) wrapper.getContainer());
} else {
- return (CastorCMP11_EntityContainer) container;
+ return (LocalCastorContainer) container;
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/JDOManagerBuilder.java Sat Dec 2 17:22:45 2006
@@ -127,7 +127,7 @@
transactionDemarcation.setTransactionManager(transactionManager);
jdoConf.setTransactionDemarcation(transactionDemarcation);
- JDOManager.loadConfiguration(jdoConf, null, classLoader);
+ JDOManager.loadConfiguration(jdoConf, null, classLoader, null);
// Construct a new JDOManager for the database
return JDOManager.createInstance(database.getName());
@@ -206,7 +206,7 @@
jdoConf.setTransactionDemarcation(transactionDemarcation);
- JDOManager.loadConfiguration(jdoConf, null, classLoader);
+ JDOManager.loadConfiguration(jdoConf, null, classLoader, null);
// Construct a new JDOManager for the database
return JDOManager.createInstance(database.getName());
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/LocalCastorContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/LocalCastorContainer.java?view=auto&rev=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/LocalCastorContainer.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/LocalCastorContainer.java Sat Dec 2 17:22:45 2006
@@ -0,0 +1,24 @@
+/**
+ *
+ * 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.openejb.alt.containers.castor_cmp11;
+
+import org.exolab.castor.jdo.JDOManager;
+
+public interface LocalCastorContainer {
+ JDOManager getLocalTxJDO();
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ThreadContext.java Sat Dec 2 17:22:45 2006
@@ -16,12 +16,11 @@
*/
package org.apache.openejb.core;
-import org.apache.openejb.util.FastThreadLocal;
import org.apache.openejb.ClassLoaderUtil;
public class ThreadContext implements Cloneable {
- protected static final FastThreadLocal threadStorage = new FastThreadLocal();
+ protected static final ThreadLocal<ThreadContext> threadStorage = new ThreadLocal<ThreadContext>();
protected static Class implClass = ThreadContext.class;
protected boolean valid = false;
@@ -61,7 +60,7 @@
}
public static boolean isValid() {
- ThreadContext tc = (ThreadContext) threadStorage.get();
+ ThreadContext tc = threadStorage.get();
if (tc != null)
return tc.valid;
else
@@ -78,14 +77,14 @@
}
public static void invalidate() {
- ThreadContext tc = (ThreadContext) threadStorage.get();
+ ThreadContext tc = threadStorage.get();
if (tc != null)
tc.makeInvalid();
}
public static void setThreadContext(ThreadContext tc) {
if (tc == null) {
- tc = (ThreadContext) threadStorage.get();
+ tc = threadStorage.get();
if (tc != null) tc.makeInvalid();
} else {
threadStorage.set(tc);
@@ -93,7 +92,7 @@
}
public static ThreadContext getThreadContext() {
- ThreadContext tc = (ThreadContext) threadStorage.get();
+ ThreadContext tc = threadStorage.get();
if (tc == null) {
tc = ThreadContext.newThreadContext();
threadStorage.set(tc);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Sat Dec 2 17:22:45 2006
@@ -50,7 +50,7 @@
-->
<ServiceProvider id="Default CMP Container"
provider-type="Container"
- constructor="id, transactionManager, securityService, deployments, PoolSize, Engine, ConnectorName, JdbcDriver, JdbcUrl, UserName, Password"
+ constructor="id, transactionManager, securityService, deployments, PoolSize, Engine, ConnectorName"
class-name="org.apache.openejb.alt.containers.castor_cmp11.CastorCMP11_EntityContainer">
# The default size of the method ready bean pools.
@@ -58,26 +58,10 @@
PoolSize 100
- Engine derby
+ #Engine derby
+ Engine instantdb
ConnectorName Default JDBC Database
-
- # Driver class name
-
- JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-
- # Url for creating connections
-
- JdbcUrl jdbc:derby:derbyDB;create=true
-
- # Default user name
-
- UserName admin
-
- # Default password
-
- Password pass
-
</ServiceProvider>
<!--
@@ -273,15 +257,18 @@
# Driver class name
- JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+ #JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
+ JdbcDriver org.enhydra.instantdb.jdbc.idbDriver
# Url for creating connections
- JdbcUrl jdbc:derby:derbyDB;create=true
+ #JdbcUrl jdbc:derby:derbyDB;create=true
+ JdbcUrl jdbc:idb:conf/instantdb.properties
# Default user name
- UserName admin
+ #UserName admin
+ UserName Admin
# Default password
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Sat Dec 2 17:22:45 2006
@@ -41,11 +41,17 @@
<o:sharedLocalConnectionManager id="defaultConnectionManager"
transactionManager="#transactionManager"/>
+ <!--<o:jdbcConnectionFactory id="defaultJdbcDatabase"-->
+ <!--defaultUserName="admin"-->
+ <!--defaultPassword="pass"-->
+ <!--url="jdbc:derby:derbyDB;create=true"-->
+ <!--driver="org.apache.derby.jdbc.EmbeddedDriver"/>-->
+
<o:jdbcConnectionFactory id="defaultJdbcDatabase"
defaultUserName="Admin"
defaultPassword="pass"
- url="jdbc:derby:derbyDB;create=true"
- driver="org.apache.derby.jdbc.EmbeddedDriver"/>
+ url="jdbc:idb:conf/instantdb.properties"
+ driver="org.enhydra.instantdb.jdbc.idbDriver"/>
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
@@ -77,25 +83,10 @@
poolSize 100
- engine derby
+ #engine derby
+ engine instantdb
connectorName Default JDBC Database
-
- # Driver class name
-
- jdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-
- # Url for creating connections
-
- jdbcUrl jdbc:derby:derbyDB;create=true
-
- # Default user name
-
- userName admin
-
- # Default password
-
- password pass
transactionManager #transactionManager
securityService #securityService
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml Sat Dec 2 17:22:45 2006
@@ -38,11 +38,17 @@
<o:sharedLocalConnectionManager id="defaultConnectionManager"
transactionManager="#transactionManager"/>
+ <!--<o:jdbcConnectionFactory id="defaultJdbcDatabase"-->
+ <!--defaultUserName="admin"-->
+ <!--defaultPassword="pass"-->
+ <!--url="jdbc:derby:derbyDB;create=true"-->
+ <!--driver="org.apache.derby.jdbc.EmbeddedDriver"/>-->
+
<o:jdbcConnectionFactory id="defaultJdbcDatabase"
defaultUserName="Admin"
defaultPassword="pass"
- url="jdbc:derby:derbyDB;create=true"
- driver="org.apache.derby.jdbc.EmbeddedDriver"/>
+ url="jdbc:idb:conf/instantdb.properties"
+ driver="org.enhydra.instantdb.jdbc.idbDriver"/>
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
@@ -74,25 +80,10 @@
poolSize 100
- engine derby
+ #engine derby
+ engine instantdb
connectorName Default JDBC Database
-
- # Driver class name
-
- jdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-
- # Url for creating connections
-
- jdbcUrl jdbc:derby:derbyDB;create=true
-
- # Default user name
-
- userName admin
-
- # Default password
-
- password pass
transactionManager #transactionManager
securityService #securityService
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Sat Dec 2 17:22:45 2006
@@ -30,26 +30,10 @@
PoolSize 100
+ #Engine instantdb
Engine derby
ConnectorName Default JDBC Database
-
- # Driver class name
-
- JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
-
- # Url for creating connections
-
- JdbcUrl jdbc:derby:derbyDB;create=true
-
- # Default user name
-
- UserName admin
-
- # Default password
-
- Password pass
-
</Container>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java Sat Dec 2 17:22:45 2006
@@ -44,7 +44,8 @@
}
// org.apache.log4j.BasicConfigurator.configure();
System.setProperty("openejb.test.server", org.apache.openejb.test.IvmTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+ //System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
System.setProperty("openejb.deployments.classpath", "true");
TestManager.init(null);
TestManager.start();
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java Sat Dec 2 17:22:45 2006
@@ -109,8 +109,8 @@
private static void runLocalTests() {
System.setProperty("openejb.test.server",
"org.apache.openejb.test.IvmTestServer");
- System.setProperty("openejb.test.database",
- "org.apache.openejb.test.DerbyTestDatabase");
+// System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+ System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -122,8 +122,8 @@
private static void runRemoteTests() {
System.setProperty("openejb.test.server",
"org.apache.openejb.test.RemoteTestServer");
- System.setProperty("openejb.test.database",
- "org.apache.openejb.test.DerbyTestDatabase");
+// System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+ System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -135,8 +135,8 @@
private static void runRemoteHttpTests() {
System.setProperty("openejb.test.server",
"org.apache.openejb.test.RemoteHttpTestServer");
- System.setProperty("openejb.test.database",
- "org.apache.openejb.test.DerbyTestDatabase");
+// System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+ System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -147,7 +147,8 @@
private static void runTomcatRemoteHttpTests() {
System.setProperty("openejb.test.server", TomcatRemoteTestServer.class.getName());
- System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+// System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+ System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
System.out.println("_________________________________________________");
System.out
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpHomeIntfcTests.java Sat Dec 2 17:22:45 2006
@@ -53,6 +53,7 @@
ejbObject = ejbHome.findByPrimaryKey((Integer)ejbPrimaryKey);
assertNotNull("The EJBObject is null", ejbObject);
} catch (Exception e){
+ e.printStackTrace();
fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
}
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpLocalTestSuite.java Sat Dec 2 17:22:45 2006
@@ -31,17 +31,17 @@
public CmpLocalTestSuite(){
super();
-// this.addTest(new CmpJndiTests());
-// this.addTest(new CmpHomeIntfcTests());
-// this.addTest(new CmpEjbHomeTests());
-// this.addTest(new CmpEjbObjectTests());
-// this.addTest(new CmpRemoteIntfcTests());
-// this.addTest(new CmpHomeHandleTests());
-// this.addTest(new CmpHandleTests());
-// this.addTest(new CmpEjbMetaDataTests());
+ this.addTest(new CmpJndiTests());
+ this.addTest(new CmpHomeIntfcTests());
+ this.addTest(new CmpEjbHomeTests());
+ this.addTest(new CmpEjbObjectTests());
+ this.addTest(new CmpRemoteIntfcTests());
+ this.addTest(new CmpHomeHandleTests());
+ this.addTest(new CmpHandleTests());
+ this.addTest(new CmpEjbMetaDataTests());
//TODO:0:this.addTest(new CmpAllowedOperationsTests());
-// this.addTest(new CmpJndiEncTests());
-// this.addTest(new CmpRmiIiopTests());
+ this.addTest(new CmpJndiEncTests());
+ this.addTest(new CmpRmiIiopTests());
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpTestSuite.java Sat Dec 2 17:22:45 2006
@@ -32,17 +32,17 @@
public CmpTestSuite(){
super();
-// this.addTest(new CmpJndiTests());
-// this.addTest(new CmpHomeIntfcTests());
-// this.addTest(new CmpEjbHomeTests());
-// this.addTest(new CmpEjbObjectTests());
-// this.addTest(new CmpRemoteIntfcTests());
-// this.addTest(new CmpHomeHandleTests());
-// this.addTest(new CmpHandleTests());
-// this.addTest(new CmpEjbMetaDataTests());
+ this.addTest(new CmpJndiTests());
+ this.addTest(new CmpHomeIntfcTests());
+ this.addTest(new CmpEjbHomeTests());
+ this.addTest(new CmpEjbObjectTests());
+ this.addTest(new CmpRemoteIntfcTests());
+ this.addTest(new CmpHomeHandleTests());
+ this.addTest(new CmpHandleTests());
+ this.addTest(new CmpEjbMetaDataTests());
//TODO:0:this.addTest(new CmpAllowedOperationsTests());
-// this.addTest(new CmpJndiEncTests());
-// this.addTest(new CmpRmiIiopTests());
+ this.addTest(new CmpJndiEncTests());
+ this.addTest(new CmpRmiIiopTests());
}
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Sat Dec 2 17:22:45 2006
@@ -286,13 +286,51 @@
<version>2.2.3</version>
</dependency>
<dependency>
- <groupId>castor</groupId>
+ <groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
- </dependency>
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>1.0</version>
+ <version>1.0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>adaptx</groupId>
+ <artifactId>adaptx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.cenqua.clover</groupId>
+ <artifactId>clover</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -405,10 +443,6 @@
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>mx4j</groupId>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Sat Dec 2 17:22:45 2006
@@ -54,6 +54,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.version}</version>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java Sat Dec 2 17:22:45 2006
@@ -43,7 +43,8 @@
protected void setUp() throws Exception {
System.setProperty("openejb.test.server", EjbTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+// System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
TestManager.init(null);
TestManager.start();
}
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml Sat Dec 2 17:22:45 2006
@@ -71,6 +71,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java?view=diff&rev=481685&r1=481684&r2=481685
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java Sat Dec 2 17:22:45 2006
@@ -19,6 +19,7 @@
import org.apache.openejb.test.TestManager;
import org.apache.openejb.test.entity.bmp.BmpTestSuite;
+import org.apache.openejb.test.entity.cmp.CmpTestSuite;
import org.apache.openejb.test.stateful.StatefulTestSuite;
import org.apache.openejb.test.stateless.StatelessTestSuite;
import org.apache.openejb.OpenEJB;
@@ -42,7 +43,8 @@
protected void setUp() throws Exception {
System.setProperty("openejb.test.server", HttpEjbTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+// System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
TestManager.init(null);
TestManager.start();
}
@@ -58,7 +60,7 @@
suite.addTest(StatefulTestSuite.suite());
suite.addTest(BmpTestSuite.suite());
// TODO: The CmpTestSuite deadlocks intellij for some reason.
-// suite.addTest(CmpTestSuite.suite());
+ suite.addTest(CmpTestSuite.suite());
return suite;
}
Re: svn commit: r481685 - in /incubator/openejb/trunk/openejb3: ./ container/openejb-core/ container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ container/openejb-core/src/main/java/org/apache/openejb/core/ container/openejb-...
Posted by David Blevins <da...@visi.com>.
Great commit!
The best part about it is that now we no longer need to repeat the
JDBC information in the cmp container configuration.
What do you think about renaming the class LocalCastorContainer to
something else like LocalJdoSource, LocalJdoManagerSource or
something without the word "Container" in it?
-David