geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r630370 [4/4] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5/ framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ plugins/clustering/geronimo-clustering-wadi/src/main/java/org/apache/geroni...
Date Sat, 23 Feb 2008 01:03:09 GMT
Added: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java (added)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java Fri Feb 22 17:02:57 2008
@@ -0,0 +1,264 @@
+/*
+ * 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.geronimo.openejb.cluster.stateful.container;
+
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.Collections;
+
+import javax.transaction.TransactionManager;
+
+import org.apache.geronimo.clustering.wadi.WADISessionManager;
+import org.apache.geronimo.openejb.cluster.infra.NetworkConnectorTracker;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.spi.SecurityService;
+import org.codehaus.wadi.core.contextualiser.Invocation;
+import org.codehaus.wadi.core.contextualiser.InvocationException;
+import org.codehaus.wadi.core.manager.Manager;
+import org.codehaus.wadi.servicespace.ServiceRegistry;
+import org.codehaus.wadi.servicespace.ServiceSpace;
+
+import com.agical.rmock.core.Action;
+import com.agical.rmock.core.MethodHandle;
+import com.agical.rmock.extension.junit.RMockTestCase;
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+public class ClusteredStatefulContainerTest extends RMockTestCase {
+
+    private WADISessionManager sessionManager;
+    private TransactionManager txManager;
+    private SecurityService securityService;
+    private ClusteredStatefulContainer container;
+    private CoreDeploymentInfo deploymentInfo;
+    private String deploymentId;
+    private Method callMethod;
+    private Manager wadiManager;
+    private NetworkConnectorTracker tracker;
+    private String primKey;
+    private Class<Runnable> callInterface;
+    private Object[] args;
+
+    @Override
+    protected void setUp() throws Exception {
+        primKey = "primKey";
+        callInterface = Runnable.class;
+        callMethod = Runnable.class.getDeclaredMethod("run");
+        args = new Object[0];
+        
+        sessionManager = (WADISessionManager) mock(WADISessionManager.class);
+        wadiManager = sessionManager.getManager();
+        modify().multiplicity(expect.from(0));
+        
+        sessionManager.registerListener(null);
+        modify().multiplicity(expect.from(0)).args(is.NOT_NULL);
+        
+        ServiceSpace serviceSpace = sessionManager.getServiceSpace();
+        modify().multiplicity(expect.from(0));
+        ServiceRegistry serviceRegistry = serviceSpace.getServiceRegistry();
+        modify().multiplicity(expect.from(0));
+        serviceRegistry.getStartedService(NetworkConnectorTracker.NAME);
+        modify().multiplicity(expect.from(0));
+        tracker = (NetworkConnectorTracker) mock(NetworkConnectorTracker.class);
+        modify().returnValue(tracker);
+        
+        txManager = (TransactionManager) mock(TransactionManager.class);
+        securityService = (SecurityService) mock(SecurityService.class);
+        container = (ClusteredStatefulContainer) intercept(ClusteredStatefulContainer.class, new Object[] {"id",
+            txManager,
+            securityService, 
+            null,
+            1,
+            1,
+            1});
+        deploymentId = "deploymentId";
+        deploymentInfo = new CoreDeploymentInfo(null,
+            SFSB.class,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null) {
+            @Override
+            public Object getDeploymentID() {
+                return deploymentId;
+            }
+        };
+    }
+    
+    public void testInvokeBusinessMethodForUnknownDeploymentThrowsOEJBE() throws Exception {
+        startVerification();
+        try {
+            container.businessMethod(deploymentInfo, primKey, callInterface, callMethod, args);
+            fail();
+        } catch (OpenEJBException e) {
+        }
+    }
+    
+    public void testInvokeRemoteMethodForUnknownDeploymentThrowsOEJBE() throws Exception {
+        startVerification();
+        try {
+            container.removeEJBObject(deploymentInfo, primKey, callInterface, callMethod, args);
+            fail();
+        } catch (OpenEJBException e) {
+        }
+    }
+    
+    public void testOEJBIsRethrownForBusinessMethod() throws Exception {
+        new OEJBIsRethrownTest() {
+            @Override
+            protected void executeMethod() throws OpenEJBException {
+                container.businessMethod(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+            @Override
+            protected void executeSuperMethod() throws OpenEJBException {
+                container.superBusinessMethod(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+        }.executeTest();
+    }
+    
+    public void testOEJBIsRethrownForRemoveMethod() throws Exception {
+        new OEJBIsRethrownTest() {
+            @Override
+            protected void executeMethod() throws OpenEJBException {
+                container.removeEJBObject(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+            @Override
+            protected void executeSuperMethod() throws OpenEJBException {
+                container.superRemoveEJBObject(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+        }.executeTest();
+    }
+    
+    protected abstract class OEJBIsRethrownTest {
+        public void executeTest() throws Exception {
+            recordContextualiseInvocation();
+            
+            executeSuperMethod();
+            OpenEJBException exception = new OpenEJBException();
+            modify().throwException(exception);
+            
+            startVerification();
+            
+            container.addSessionManager(deploymentId, sessionManager);
+
+            try {
+                executeMethod();
+                fail();
+            } catch (OpenEJBException e) {
+                assertSame(exception, e);
+            }
+        }
+        
+        protected abstract void executeSuperMethod() throws OpenEJBException;
+        
+        protected abstract void executeMethod() throws OpenEJBException;
+    }
+    
+    public void testBusinessMethodInvokationOK() throws Exception {
+        new MethodIsExecutedTest() {
+            @Override
+            protected Object executeMethod() throws OpenEJBException {
+                return container.businessMethod(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+            @Override
+            protected void executeSuperMethod() throws OpenEJBException {
+                container.superBusinessMethod(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+        }.executeTest();
+    }
+
+    public void testRemoveMethodInvokationOK() throws Exception {
+        new MethodIsExecutedTest() {
+            @Override
+            protected Object executeMethod() throws OpenEJBException {
+                return container.removeEJBObject(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+            @Override
+            protected void executeSuperMethod() throws OpenEJBException {
+                container.superRemoveEJBObject(deploymentInfo, primKey, callInterface, callMethod, args);
+            }
+        }.executeTest();
+    }
+
+    protected abstract class MethodIsExecutedTest {
+        public void executeTest() throws Exception {
+            recordContextualiseInvocation();
+            
+            executeSuperMethod();
+            Object result = new Object();
+            modify().returnValue(result);
+            
+            startVerification();
+            
+            container.addSessionManager(deploymentId, sessionManager);
+            
+            Object actualResult = executeMethod();
+            assertSame(result, actualResult);
+        }
+        
+        protected abstract void executeSuperMethod() throws OpenEJBException;
+        
+        protected abstract Object executeMethod() throws OpenEJBException;
+    }
+    
+    public void testGetLocationsRetunsNullWhenDeploymentIsNotRegistered() throws Exception {
+        startVerification();
+        
+        assertNull(container.getLocations(deploymentInfo));
+    }
+    
+    public void testGetLocationsOK() throws Exception {
+        tracker.getConnectorURIs(deploymentId);
+        URI location = new URI("ejbd://host:1");
+        modify().returnValue(Collections.singleton(location));
+        
+        startVerification();
+        
+        container.addSessionManager(deploymentId, sessionManager);
+        
+        URI[] actualLocations = container.getLocations(deploymentInfo);
+        assertEquals(1, actualLocations.length);
+        assertSame(location, actualLocations[0]);
+    }
+    
+    public static class SFSB implements Runnable {
+        public void run() {
+        }
+    }
+    
+    protected void recordContextualiseInvocation() throws InvocationException {
+        wadiManager.contextualise(null);
+        modify().args(is.NOT_NULL).perform(new Action() {
+            public Object invocation(Object[] arg0, MethodHandle arg1) throws Throwable {
+                ((Invocation) arg0[0]).invoke();
+                return true;
+            }
+        });
+    }
+    
+}

Added: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManagerTest.java?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManagerTest.java (added)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulInstanceManagerTest.java Fri Feb 22 17:02:57 2008
@@ -0,0 +1,254 @@
+/*
+ * 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.geronimo.openejb.cluster.stateful.container;
+
+import java.io.IOException;
+import java.rmi.dgc.VMID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+import org.apache.geronimo.clustering.Session;
+import org.apache.geronimo.clustering.SessionListener;
+import org.apache.geronimo.clustering.wadi.WADISessionManager;
+import org.apache.geronimo.openejb.cluster.stateful.container.ClusteredStatefulContainerTest.SFSB;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.stateful.BeanEntry;
+import org.apache.openejb.persistence.JtaEntityManagerRegistry;
+import org.apache.openejb.spi.SecurityService;
+
+import com.agical.rmock.core.Action;
+import com.agical.rmock.core.MethodHandle;
+import com.agical.rmock.core.describe.ExpressionDescriber;
+import com.agical.rmock.core.match.operator.AbstractExpression;
+import com.agical.rmock.extension.junit.RMockTestCase;
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+public class ClusteredStatefulInstanceManagerTest extends RMockTestCase {
+
+    private ClusteredStatefulInstanceManager manager;
+    private String deploymentId;
+    private CoreDeploymentInfo deploymentInfo;
+    private VMID primKey;
+    private ThreadContext threadContext;
+    private WADISessionManager sessionManager;
+    private SessionListener sessionListener;
+
+    @Override
+    protected void setUp() throws Exception {
+        TransactionManager txManager = (TransactionManager) mock(TransactionManager.class);
+        SecurityService securityService = (SecurityService) mock(SecurityService.class);
+        TransactionSynchronizationRegistry txSynchRegistry = (TransactionSynchronizationRegistry) mock(TransactionSynchronizationRegistry.class);
+        JtaEntityManagerRegistry jtaEntityManagerRegistry = new JtaEntityManagerRegistry(txSynchRegistry);
+        
+        manager = (ClusteredStatefulInstanceManager) intercept(ClusteredStatefulInstanceManager.class,
+            new Object[] { txManager, securityService, jtaEntityManagerRegistry, null, 1, 1, 1 });
+        
+        deploymentId = "deploymentId";
+        deploymentInfo = new CoreDeploymentInfo(null,
+            SFSB.class,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null) {
+            @Override
+            public ClassLoader getClassLoader() {
+                return getClass().getClassLoader();
+            }
+            @Override
+            public Object getDeploymentID() {
+                return deploymentId;
+            }
+        };
+
+        primKey = new VMID();
+
+        sessionManager = (WADISessionManager) mock(WADISessionManager.class);
+
+        threadContext = new ThreadContext(deploymentInfo, primKey);
+        ThreadContext.enter(threadContext);
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+        ThreadContext.exit(threadContext);
+    }
+    
+    public void testNewBeanEntryForUnknownDeploymentThrowsISE() throws Exception {
+        startVerification();
+        
+        try {
+            manager.newBeanEntry("primaryKey", new Object());
+            fail();
+        } catch (IllegalStateException e) {
+        }
+    }
+    
+    public void testNewBeanEntryOK() throws Exception {
+        VMID primaryKey = new VMID();
+
+        recordAddSessionManagerAndCreateSession(primaryKey);
+        
+        startVerification();
+        
+        manager.addSessionManager(deploymentId, sessionManager);
+        manager.newBeanEntry(primaryKey, new Object());
+    }
+
+    public void testSessionDestructionFreeInstance() throws Exception {
+        Session session = recordAddSessionManagerAndCreateSession(primKey);
+        FutureTask<BeanEntry> newBeanEntryTask = newBeanEntryTask(primKey, session);
+
+        manager.freeInstance(null);
+        modify().args(new ThreadContextArgAssertion());
+        
+        startVerification();
+        
+        manager.deploy(deploymentInfo, null);
+        manager.addSessionManager(deploymentId, sessionManager);
+        
+        newBeanEntryTask.run();
+        sessionListener.notifySessionDestruction(session);
+    }
+
+    public void testInboundSessionMigrationActivateAndPoolBeanEntry() throws Exception {
+        Session session = recordAddSessionManagerAndCreateSession(primKey);
+        FutureTask<BeanEntry> newBeanEntryTask = newBeanEntryTask(primKey, session);
+
+        manager.activateInstance(null, null);
+        modify().args(new ThreadContextArgAssertion(), is.NOT_NULL);
+        manager.poolInstance(null, null);
+        modify().args(new ThreadContextArgAssertion(), is.NOT_NULL);
+        
+        startVerification();
+        
+        manager.deploy(deploymentInfo, null);
+        manager.addSessionManager(deploymentId, sessionManager);
+        
+        newBeanEntryTask.run();
+        sessionListener.notifyInboundSessionMigration(session);
+    }
+    
+    public void testOutboundSessionMigrationPassivateBeanEntry() throws Exception {
+        Session session = recordAddSessionManagerAndCreateSession(primKey);
+        FutureTask<BeanEntry> newBeanEntryTask = newBeanEntryTask(primKey, session);
+        
+        manager.passivate(null, null);
+        modify().args(new ThreadContextArgAssertion(), is.NOT_NULL);
+        
+        manager.freeInstance(null);
+        modify().args(new ThreadContextArgAssertion());
+        
+        startVerification();
+        
+        manager.deploy(deploymentInfo, null);
+        manager.addSessionManager(deploymentId, sessionManager);
+        
+        newBeanEntryTask.run();
+        sessionListener.notifyOutboundSessionMigration(session);
+    }
+    
+    public void testOnFreeBeanEntryReleaseSession() throws Exception {
+        Session session = (Session) mock(Session.class);
+        session.addState(ClusteredBeanEntry.SESSION_KEY_ENTRY, null);
+        modify().args(is.AS_RECORDED, is.NOT_NULL);
+
+        session.release();
+        
+        startVerification();
+
+        manager.onFreeBeanEntry(threadContext, new ClusteredBeanEntry(session, deploymentId, new Object(), primKey, 0));
+    }
+    
+    public void testOnPoolInstanceWithoutTransactionTriggersSessionOnEndAccess() throws Exception {
+        Session session = (Session) mock(Session.class);
+        session.addState(ClusteredBeanEntry.SESSION_KEY_ENTRY, null);
+        modify().args(is.AS_RECORDED, is.NOT_NULL);
+        
+        session.onEndAccess();
+        
+        startVerification();
+        
+        manager.onPoolInstanceWithoutTransaction(threadContext, new ClusteredBeanEntry(session,
+            deploymentId,
+            new Object(),
+            primKey,
+            0));
+    }
+    
+    private FutureTask<BeanEntry> newBeanEntryTask(final VMID primaryKey, Session session) {
+        final FutureTask<BeanEntry> newBeanEntryTask = new FutureTask<BeanEntry>(new Callable<BeanEntry>() {
+            public BeanEntry call() throws Exception {
+                return manager.newBeanEntry(primaryKey, new Object());
+            }
+        });
+        session.getState(ClusteredBeanEntry.SESSION_KEY_ENTRY);
+        modify().multiplicity(expect.from(0)).perform(new Action() {
+            public Object invocation(Object[] arg0, MethodHandle arg1) throws Throwable {
+                return newBeanEntryTask.get();
+            }
+        });
+        return newBeanEntryTask;
+    }
+    
+    private Session recordAddSessionManagerAndCreateSession(VMID primaryKey) throws Exception {
+        sessionManager.registerListener(null);
+        modify().args(new AbstractExpression() {
+            public void describeWith(ExpressionDescriber arg0) throws IOException {
+            }
+
+            public boolean passes(Object arg0) {
+                sessionListener = (SessionListener) arg0;
+                return true;
+            }
+        });
+        
+        Session session = sessionManager.createSession(primaryKey.toString());
+        
+        session.addState(ClusteredBeanEntry.SESSION_KEY_ENTRY, null);
+        modify().args(is.AS_RECORDED, is.NOT_NULL);
+        
+        return session;
+    }
+    
+    protected final class ThreadContextArgAssertion extends AbstractExpression {
+        public void describeWith(ExpressionDescriber arg0) throws IOException {
+        }
+
+        public boolean passes(Object arg0) {
+            ThreadContext context = (ThreadContext) arg0;
+            assertSame(deploymentInfo, context.getDeploymentInfo());
+            assertSame(primKey, context.getPrimaryKey());
+            return true;
+        }
+    }
+
+}

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Fri Feb 22 17:02:57 2008
@@ -126,6 +126,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering</artifactId>
+            <version>${version}</version>
+        </dependency>
         <!-- g-transaction, g-security, g-naming  come transitively from this -->
         <!-- g-j2ee, g-kernel come from this via g-management -->
         <dependency>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java Fri Feb 22 17:02:57 2008
@@ -29,7 +29,6 @@
 
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
 import org.apache.geronimo.management.EJB;
-import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jacc.RunAsSource;
 import org.apache.openejb.BeanType;
 import org.apache.openejb.Container;
@@ -37,9 +36,9 @@
 import org.apache.openejb.core.CoreDeploymentInfo;
 import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
 
-public class EjbDeployment implements EJB {
+public class EjbDeployment implements EJB, EjbDeploymentIdAccessor {
     private final String objectName;
-    private final String deploymentId;
+    protected final String deploymentId;
     private final String ejbName;
 
     private final String homeInterfaceName;
@@ -61,9 +60,9 @@
     private final Set applicationManagedSecurityResources;
     private final TrackedConnectionAssociator trackedConnectionAssociator;
 
-    private final OpenEjbSystem openEjbSystem;
+    protected final OpenEjbSystem openEjbSystem;
 
-    private CoreDeploymentInfo deploymentInfo;
+    protected CoreDeploymentInfo deploymentInfo;
 
     private Context javaCompSubContext;
 

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java Fri Feb 22 17:02:57 2008
@@ -86,7 +86,7 @@
     }
 
     // do not use this gbean info, instead use StatelessDeploymentGBean, StatefulDeploymentGBean, EntityDeploymentGBean, or MessageDrivenDeploymentGBean
-    static final GBeanInfo GBEAN_INFO;
+    public static final GBeanInfo GBEAN_INFO;
 
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class, EjbDeploymentGBean.class, NameFactory.STATELESS_SESSION_BEAN);

Added: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentIdAccessor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentIdAccessor.java?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentIdAccessor.java (added)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentIdAccessor.java Fri Feb 22 17:02:57 2008
@@ -0,0 +1,28 @@
+/*
+ * 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.geronimo.openejb;
+
+/**
+ *
+ * @version $Rev:$ $Date:$
+ */
+public interface EjbDeploymentIdAccessor {
+    String getDeploymentId();
+}

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/LICENSE.txt?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/LICENSE.txt (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/LICENSE.txt Fri Feb 22 17:02:57 2008
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/NOTICE.txt?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/NOTICE.txt (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/NOTICE.txt Fri Feb 22 17:02:57 2008
@@ -0,0 +1,14 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache OpenEJB distribution.                  ==
+   =========================================================================
+
+   Apache Geronimo 
+   Copyright 2003-2007 The Apache Software Foundation
+
+   Apache OpenEJB Project
+   Copyright 1999-2007 The Apache Software Foundation
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml Fri Feb 22 17:02:57 2008
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb-clustering-builder-wadi</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: Clustering Builder for WADI</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-clustering-wadi</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>EJB Container</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb-deployer</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                        </dependency>
+
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb-clustering-wadi</artifactId>
+                            <version>${version}</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/plan/plan.xml?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/src/main/plan/plan.xml Fri Feb 22 17:02:57 2008
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+-->
+
+<!-- $Rev: 589946 $ $Date: 2007-10-30 13:53:25 +1100 (Tue, 30 Oct 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="OpenEJBClusteringBuilder" class="org.apache.geronimo.openejb.deployment.cluster.WADIOpenEJBClusteringBuilder">
+        <attribute name="defaultClusteredStatefulContainerId">org.apache.geronimo.openejb.cluster:Default Clustered Stateful Container</attribute>
+        <attribute name="defaultSweepInterval">10</attribute>
+        <attribute name="defaultSessionTimeout">3600</attribute>
+        <attribute name="defaultNumPartitions">24</attribute>
+        <attribute name="defaultBackingStrategyFactoryName">?name=DefaultBackingStrategyFactory</attribute>
+        <attribute name="defaultClusterName">?name=DefaultCluster</attribute>
+        <attribute name="defaultNetworkConnectorName">?#org.apache.geronimo.openejb.EjbDaemonGBean</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>openejb-clustering-wadi</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/LICENSE.txt?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/LICENSE.txt (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/LICENSE.txt Fri Feb 22 17:02:57 2008
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/NOTICE.txt?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/NOTICE.txt (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/NOTICE.txt Fri Feb 22 17:02:57 2008
@@ -0,0 +1,14 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache OpenEJB distribution.                  ==
+   =========================================================================
+
+   Apache Geronimo 
+   Copyright 2003-2007 The Apache Software Foundation
+
+   Apache OpenEJB Project
+   Copyright 1999-2007 The Apache Software Foundation
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml Fri Feb 22 17:02:57 2008
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
+
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb-clustering-wadi</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: Clustering over WADI</name>
+    <packaging>car</packaging>
+
+    <description>WADI clustering for OpenEJB.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb-clustering-wadi</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>EJB Container</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false"/>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml?rev=630370&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/plan/plan.xml Fri Feb 22 17:02:57 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+-->
+
+<!-- $Rev: 589946 $ $Date: 2007-10-30 13:53:25 +1100 (Tue, 30 Oct 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="DefaultClusteredStatefulContainer" class="org.apache.geronimo.openejb.EjbContainer">
+        <attribute name="id">org.apache.geronimo.openejb.cluster:Default Clustered Stateful Container</attribute>
+        <attribute name="type">STATEFUL</attribute>
+        <attribute name="properties">PoolSize=1000</attribute>
+        <reference name="OpenEjbSystem">
+            <name>OpenEjbSystem</name>
+        </reference>
+    </gbean>
+
+</module>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml Fri Feb 22 17:02:57 2008
@@ -39,6 +39,9 @@
             <pattern>
                 <name>CorbaModuleBuilderExtension</name>
             </pattern>
+            <pattern>
+                <name>OpenEJBClusteringBuilder</name>
+            </pattern>
         </references>
         <reference name="SecurityBuilders">
             <name>SecurityBuilder</name>

Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Fri Feb 22 17:02:57 2008
@@ -39,8 +39,12 @@
     <modules>
         <module>geronimo-openejb</module>
         <module>geronimo-openejb-builder</module>
+        <module>geronimo-openejb-clustering-wadi</module>
+        <module>geronimo-openejb-clustering-builder-wadi</module>
         <module>openejb</module>
         <module>openejb-deployer</module>
+        <module>openejb-clustering-wadi</module>
+        <module>openejb-clustering-builder-wadi</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=630370&r1=630369&r2=630370&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Feb 22 17:02:57 2008
@@ -399,7 +399,7 @@
             <dependency>
                 <groupId>com.agical.rmock</groupId>
                 <artifactId>rmock</artifactId>
-                <version>2.0.0-rc-6</version>
+                <version>2.0.0</version>
             </dependency>
 
             <dependency>
@@ -1066,25 +1066,25 @@
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-aop</artifactId>
-                <version>2.0-M7</version>
+                <version>2.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-core</artifactId>
-                <version>2.0-M7</version>
+                <version>2.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-group</artifactId>
-                <version>2.0-M7</version>
+                <version>2.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.codehaus.wadi</groupId>
                 <artifactId>wadi-tribes</artifactId>
-                <version>2.0-M7</version>
+                <version>2.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>



Mime
View raw message