You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by gd...@apache.org on 2006/10/26 14:17:38 UTC
svn commit: r467981 - in /incubator/openejb/trunk/openejb2/modules:
openejb-builder/src/main/java/org/apache/openejb/deployment/ openejb-core/
openejb-core/src/main/java/org/apache/openejb/
openejb-core/src/main/java/org/apache/openejb/cluster/ openejb...
Author: gdamour
Date: Thu Oct 26 05:17:37 2006
New Revision: 467981
URL: http://svn.apache.org/viewvc?view=rev&rev=467981
Log:
Drop clustering code; with the new WADI implementation, this code can
be simplified. Also, it should now be possible to write clustering on
top of the Geronimo clustering API.
Removed:
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/cluster/
incubator/openejb/trunk/openejb2/modules/openejb-core/src/test/java/org/apache/openejb/cluster/
Modified:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-core/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentGBean.java
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/StatefulBuilder.java Thu Oct 26 05:17:37 2006
@@ -16,21 +16,14 @@
*/
package org.apache.openejb.deployment;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.openejb.StatefulEjbDeploymentGBean;
import org.apache.openejb.StatefulEjbContainer;
+import org.apache.openejb.StatefulEjbDeploymentGBean;
/**
* @version $Revision$ $Date$
*/
public class StatefulBuilder extends SessionBuilder {
- private AbstractName ejbClusterManagerName;
-
- public void setEjbClusterManagerName(AbstractName ejbClusterManagerName) {
- this.ejbClusterManagerName = ejbClusterManagerName;
- }
protected GBeanInfo getTargetGBeanInfo() {
return StatefulEjbDeploymentGBean.GBEAN_INFO;
@@ -40,11 +33,4 @@
return StatefulEjbContainer.class;
}
- public GBeanData createConfiguration() throws Exception {
- GBeanData gbean = super.createConfiguration();
- if (ejbClusterManagerName != null) {
- gbean.setReferencePattern("EJBClusterManager", ejbClusterManagerName);
- }
- return gbean;
- }
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/pom.xml?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/pom.xml Thu Oct 26 05:17:37 2006
@@ -196,28 +196,6 @@
<artifactId>axis</artifactId>
</dependency>
- <!-- TODO REFACTOR SO THESE AREN'T DEPENDENCIES -->
- <dependency>
- <groupId>activecluster</groupId>
- <artifactId>activecluster</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>3.2.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>wadi</groupId>
- <artifactId>wadi-core</artifactId>
- <version>2.0M1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -246,8 +224,6 @@
<excludes>
<!-- TestPrincipal.java is not a test - if this is common across OpenEJB we should use **/Test*.java instead -->
<exclude>**/TestPrincipal.java</exclude>
- <!-- E2EIntegrationTest is failing in a WADI call to activecluster, probably some kind of versionitis... -->
- <exclude>**/E2EIntegrationTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeployment.java Thu Oct 26 05:17:37 2006
@@ -16,19 +16,18 @@
*/
package org.apache.openejb;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+
+import javax.security.auth.Subject;
+
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.management.J2EEManagedObject;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.geronimo.timer.PersistenceException;
import org.apache.openejb.cache.InstanceCache;
import org.apache.openejb.cache.SimpleInstanceCache;
-import org.apache.openejb.cluster.server.ClusteredEjbDeployment;
-import org.apache.openejb.cluster.server.ClusteredInstanceCache;
-import org.apache.openejb.cluster.server.ClusteredInstanceContextFactory;
-import org.apache.openejb.cluster.server.DefaultClusteredEjbDeployment;
-import org.apache.openejb.cluster.server.DefaultClusteredInstanceCache;
-import org.apache.openejb.cluster.server.EJBClusterManager;
-import org.apache.openejb.cluster.sfsb.ClusteredSFInstanceContextFactory;
import org.apache.openejb.dispatch.InterfaceMethodSignature;
import org.apache.openejb.dispatch.MethodSignature;
import org.apache.openejb.dispatch.VirtualOperation;
@@ -39,12 +38,6 @@
import org.apache.openejb.sfsb.StatefulInstanceContextFactory;
import org.apache.openejb.sfsb.StatefulInstanceFactory;
-import javax.security.auth.Subject;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-
/**
* @version $Revision$ $Date$
@@ -52,8 +45,6 @@
public class StatefulEjbDeployment extends AbstractRpcDeployment implements ExtendedEjbDeployment, J2EEManagedObject {
private final StatefulInstanceFactory instanceFactory;
private final InstanceCache instanceCache;
- private final EJBClusterManager clusterManager;
- private final ClusteredEjbDeployment clusteredEJBContainer;
private final MethodMap dispatchMethodMap;
public StatefulEjbDeployment(String containerId,
@@ -85,11 +76,7 @@
// connector stuff
Set unshareableResources,
- Set applicationManagedSecurityResources,
-
- // clustering stuff
- EJBClusterManager clusterManager) throws Exception {
-
+ Set applicationManagedSecurityResources) throws Exception {
this(containerId,
ejbName,
@@ -119,9 +106,7 @@
kernel,
unshareableResources,
- applicationManagedSecurityResources,
-
- clusterManager);
+ applicationManagedSecurityResources);
}
public StatefulEjbDeployment(String containerId,
@@ -153,10 +138,7 @@
// connector stuff
Set unshareableResources,
- Set applicationManagedSecurityResources,
-
- // clustering stuff
- EJBClusterManager clusterManager) throws Exception {
+ Set applicationManagedSecurityResources) throws Exception {
super(containerId,
ejbName,
@@ -201,38 +183,17 @@
dispatchMethodMap = buildDispatchMethodMap();
- this.clusterManager = clusterManager;
-
// build the instance factory
StatefulInstanceContextFactory contextFactory;
- if (clusterManager == null) {
- contextFactory = new StatefulInstanceContextFactory(this,
- ejbContainer,
- proxyFactory
- );
- } else {
- contextFactory = new ClusteredSFInstanceContextFactory(this,
- ejbContainer,
- proxyFactory
- );
- }
+ contextFactory = new StatefulInstanceContextFactory(this,
+ ejbContainer,
+ proxyFactory
+ );
instanceFactory = new StatefulInstanceFactory(contextFactory);
// build the cache
- InstanceCache instanceCache = new SimpleInstanceCache();
- if (clusterManager != null) {
- instanceCache = new DefaultClusteredInstanceCache(instanceCache);
- }
- this.instanceCache = instanceCache;
-
- ClusteredEjbDeployment clusteredEJBContainer = null;
- if (clusterManager != null) {
- clusteredEJBContainer = new DefaultClusteredEjbDeployment(this,
- (ClusteredInstanceCache) instanceCache,
- (ClusteredInstanceContextFactory) contextFactory);
- }
- this.clusteredEJBContainer = clusteredEJBContainer;
+ this.instanceCache = new SimpleInstanceCache();
}
public VirtualOperation getVirtualOperation(int methodIndex) {
@@ -286,22 +247,6 @@
public InstanceCache getInstanceCache() {
return instanceCache;
- }
-
- public void doStart() throws Exception {
- super.doStart();
-
- if (clusterManager != null) {
- clusterManager.addEJBContainer(clusteredEJBContainer);
- }
- }
-
- protected void destroy() throws PersistenceException {
- if (clusterManager != null) {
- clusterManager.removeEJBContainer(clusteredEJBContainer);
- }
-
- super.destroy();
}
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentFactory.java Thu Oct 26 05:17:37 2006
@@ -16,14 +16,12 @@
*/
package org.apache.openejb;
-import org.apache.openejb.cluster.server.EJBClusterManager;
/**
* @version $Revision$ $Date$
*/
public class StatefulEjbDeploymentFactory extends RpcEjbDeploymentFactory {
protected boolean beanManagedTransactions;
- protected EJBClusterManager clusterManager;
public boolean isBeanManagedTransactions() {
return beanManagedTransactions;
@@ -33,14 +31,6 @@
this.beanManagedTransactions = beanManagedTransactions;
}
- public EJBClusterManager getClusterManager() {
- return clusterManager;
- }
-
- public void setClusterManager(EJBClusterManager clusterManager) {
- this.clusterManager = clusterManager;
- }
-
public EjbDeployment create() throws Exception {
Class beanClass = loadClass(beanClassName, "bean class");
Class homeInterface = loadClass(homeInterfaceName, "home interface");
@@ -72,7 +62,6 @@
componentContext,
kernel,
unshareableResources,
- applicationManagedSecurityResources,
- clusterManager);
+ applicationManagedSecurityResources);
}
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentGBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentGBean.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentGBean.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/StatefulEjbDeploymentGBean.java Thu Oct 26 05:17:37 2006
@@ -16,17 +16,17 @@
*/
package org.apache.openejb;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+
+import javax.security.auth.Subject;
+
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.security.deploy.DefaultPrincipal;
-import org.apache.openejb.cluster.server.EJBClusterManager;
-
-import javax.security.auth.Subject;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
/**
* @version $Revision$ $Date$
@@ -68,8 +68,6 @@
infoFactory.addAttribute("unshareableResources", Set.class, true);
infoFactory.addAttribute("applicationManagedSecurityResources", Set.class, true);
- infoFactory.addReference("EJBClusterManager", EJBClusterManager.class);
-
infoFactory.setConstructor(new String[]{
"objectName",
"ejbName",
@@ -99,10 +97,7 @@
"kernel",
"unshareableResources",
- "applicationManagedSecurityResources",
-
- "EJBClusterManager",
- });
+ "applicationManagedSecurityResources"});
infoFactory.addInterface(StatefulEjbDeployment.class);
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java Thu Oct 26 05:17:37 2006
@@ -33,15 +33,14 @@
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.openejb.DeploymentIndex;
-import org.apache.openejb.RpcEjbDeployment;
-import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.EjbDeployment;
-import org.apache.openejb.corba.ORBRef;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.RpcEjbDeployment;
import org.apache.openejb.client.EJBRequest;
import org.apache.openejb.client.EJBResponse;
import org.apache.openejb.client.RequestMethods;
import org.apache.openejb.client.ResponseCodes;
-import org.apache.openejb.cluster.server.ClusteredInvocationResult;
+import org.apache.openejb.corba.ORBRef;
import org.apache.openejb.proxy.BaseEJB;
import org.apache.openejb.proxy.ProxyInfo;
@@ -279,11 +278,6 @@
throw new InvalidateReferenceException(re);
- }
-
- if (result instanceof ClusteredInvocationResult) {
- ClusteredInvocationResult clusteredResult = (ClusteredInvocationResult) result;
- res.setServers(clusteredResult.getServers());
}
if (result.isException()) {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java?view=diff&rev=467981&r1=467980&r2=467981
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/sfsb/DefaultStatefulEjbContainer.java Thu Oct 26 05:17:37 2006
@@ -35,7 +35,6 @@
import org.apache.openejb.ExtendedEjbDeployment;
import org.apache.openejb.StatefulEjbContainer;
import org.apache.openejb.SystemExceptionInterceptor;
-import org.apache.openejb.cluster.server.ClusteredInstanceInterceptor;
import org.apache.openejb.dispatch.DispatchInterceptor;
import org.apache.openejb.naming.ComponentContextInterceptor;
import org.apache.openejb.security.DefaultSubjectInterceptor;
@@ -44,8 +43,8 @@
import org.apache.openejb.security.EjbSecurityInterceptor;
import org.apache.openejb.security.PolicyContextHandlerEJBInterceptor;
import org.apache.openejb.transaction.DefaultUserTransaction;
-import org.apache.openejb.transaction.TransactionPolicyInterceptor;
import org.apache.openejb.transaction.TransactionContextInterceptor;
+import org.apache.openejb.transaction.TransactionPolicyInterceptor;
/**
@@ -98,8 +97,6 @@
if (useContextHandler) {
invocationChain = new PolicyContextHandlerEJBInterceptor(invocationChain);
}
-
- invocationChain = new ClusteredInstanceInterceptor(invocationChain);
invocationChain = new StatefulInstanceInterceptor(invocationChain, transactionManager);