geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r917394 - in /geronimo/server/branches/2.2: ./ plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openej...
Date Mon, 01 Mar 2010 05:39:47 GMT
Author: dblevins
Date: Mon Mar  1 05:39:47 2010
New Revision: 917394

URL: http://svn.apache.org/viewvc?rev=917394&view=rev
Log:
Upgraded OpenEJB to 3.1.3 SNAPSHOT

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
    geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml
    geronimo/server/branches/2.2/pom.xml

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java?rev=917394&r1=917393&r2=917394&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-clustering-wadi/src/main/java/org/apache/geronimo/openejb/cluster/container/stateless/ClusteredStatelessContainer.java
Mon Mar  1 05:39:47 2010
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geronimo.clustering.SessionManager;
 import org.apache.geronimo.clustering.wadi.WADISessionManager;
@@ -32,6 +33,7 @@
 import org.apache.openejb.ClusteredRPCContainer;
 import org.apache.openejb.DeploymentInfo;
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.Duration;
 import org.apache.openejb.core.stateless.StatelessContainer;
 import org.apache.openejb.spi.SecurityService;
 import org.codehaus.wadi.core.manager.Manager;
@@ -48,7 +50,7 @@
     private final Map<Object, NetworkConnectorTracker> deploymentIdToNetworkConnectorTracker;
 
     public ClusteredStatelessContainer(Object id, SecurityService securityService, int timeOut,
int poolSize, boolean strictPooling) throws OpenEJBException {
-        super(id, securityService, timeOut, poolSize, strictPooling);
+        super(id, securityService, new Duration(timeOut, TimeUnit.MILLISECONDS), 0, poolSize,
strictPooling);
 
         deploymentIdToManager = new ConcurrentHashMap<Object, Manager>();
         deploymentIdToNetworkConnectorTracker = new ConcurrentHashMap<Object, NetworkConnectorTracker>();

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java?rev=917394&r1=917393&r2=917394&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDaemonGBean.java
Mon Mar  1 05:39:47 2010
@@ -44,7 +44,7 @@
 
     public EjbDaemonGBean() {
         System.setProperty("openejb.nobanner","true");
-        serviceManager = new ServiceManager();
+        serviceManager = ServiceManager.getManager();
     }
 
     public String getProtocol() {

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java?rev=917394&r1=917393&r2=917394&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessContainerGBean.java
Mon Mar  1 05:39:47 2010
@@ -68,6 +68,7 @@
             @ParamReference(name = "OpenEjbSystem") OpenEjbSystem openEjbSystem,
             @ParamAttribute(name = "provider") String provider,
             @ParamAttribute(name = "poolSize") int poolSize,
+            @ParamAttribute(name = "poolMin") int poolMin,
             @ParamAttribute(name = "strictPooling") boolean strictPooling,
             @ParamAttribute(name = "timeout") int timeout,
             @ParamAttribute(name = "properties") Properties properties) {

Modified: geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml?rev=917394&r1=917393&r2=917394&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb/src/main/plan/plan.xml Mon Mar  1
05:39:47 2010
@@ -54,6 +54,7 @@
     <gbean name="DefaultStatelessContainer" class="org.apache.geronimo.openejb.StatelessContainerGBean">
         <attribute name="timeout">0</attribute>
         <attribute name="poolSize">10</attribute>
+        <attribute name="poolMin">0</attribute>
         <attribute name="strictPooling">true</attribute>
         <reference name="OpenEjbSystem">
             <name>OpenEjbSystem</name>

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=917394&r1=917393&r2=917394&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Mon Mar  1 05:39:47 2010
@@ -65,7 +65,7 @@
         <tomcatVersion>6.0.20.0</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.2</openejbVersion>
+        <openejbVersion>3.1.3-SNAPSHOT</openejbVersion>
         <derbyVersion>10.5.3.0_1</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>
         <axis2Version>1.5</axis2Version>



Mime
View raw message