[jboss-cvs] JBossAS SVN: r60870 - in branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153: ejb3 and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Feb 24 09:09:57 EST 2007
Author: wolfc
Date: 2007-02-24 09:09:57 -0500 (Sat, 24 Feb 2007)
New Revision: 60870
Modified:
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/.classpath
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/META-INF/jboss-service.xml
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
Log:
JBAS-4153
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/aspects/src/main/org/jboss/aspects/remoting/InvokeRemoteInterceptor.java 2007-02-24 14:09:57 UTC (rev 60870)
@@ -52,9 +52,17 @@
String subsystem = (String)invocation.getMetaData(REMOTING, SUBSYSTEM);
if (subsystem == null) subsystem = "AOP";
Client client = new Client(locator, subsystem);
- org.jboss.aop.joinpoint.InvocationResponse response = (org.jboss.aop.joinpoint.InvocationResponse)client.invoke(invocation, null);
- invocation.setResponseContextInfo(response.getContextInfo());
- return response.getResponse();
+ client.connect();
+ try
+ {
+ org.jboss.aop.joinpoint.InvocationResponse response = (org.jboss.aop.joinpoint.InvocationResponse)client.invoke(invocation, null);
+ invocation.setResponseContextInfo(response.getContextInfo());
+ return response.getResponse();
+ }
+ finally
+ {
+ client.disconnect();
+ }
}
Object readResolve() throws ObjectStreamException {
Property changes on: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3
___________________________________________________________________
Name: subclipse:tags
+ 60866,Branch_4_2,/branches/Branch_4_2/ejb3,branch
60868,trunk,/trunk/ejb3,branch
60869,JBoss_4_0_5_EJB3_RC9_1_JBASS-4153,/branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3,branch
59102,EJB3_RC9_Patch_1,/tags/EJB3_RC9_Patch_1/ejb3,tag
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/.classpath
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/.classpath 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/.classpath 2007-02-24 14:09:57 UTC (rev 60870)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main"/>
+ <classpathentry excluding="org/jboss/ejb3/test/clusteredentity/|org/jboss/ejb3/test/clusteredservice/|org/jboss/ejb3/test/clusteredsession/|org/jboss/ejb3/test/simplecluster/" kind="src" output="output/eclipse-test-classes" path="src/test"/>
<classpathentry kind="src" path="/ejb3x"/>
<classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
@@ -36,5 +37,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/iiop"/>
<classpathentry kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
<classpathentry kind="lib" path="/thirdparty/quartz/lib/quartz-all-1.5.2.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/test"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/META-INF/jboss-service.xml 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/META-INF/jboss-service.xml 2007-02-24 14:09:57 UTC (rev 60870)
@@ -7,7 +7,6 @@
<server>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test/interceptors2/META-INF/jboss.xml 2007-02-24 14:09:57 UTC (rev 60870)
@@ -8,6 +8,12 @@
<session>
<ejb-name>XMLOnlySLSB</ejb-name>
<jndi-name>org.jboss.ejb3.test.interceptors2.XMLOnlySLSBRemote</jndi-name>
+
+ <!-- The default is ThreadlocalPool, which could lead to new constructs. Same goes for maxSize. -->
+ <pool-config>
+ <pool-class>org.jboss.ejb3.StrictMaxPool</pool-class>
+ <pool-max-size>1</pool-max-size>
+ </pool-config>
</session>
</enterprise-beans>
</jboss>
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 14:09:57 UTC (rev 60870)
@@ -2,7 +2,6 @@
<server>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
@@ -277,7 +276,6 @@
</mbean>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">sslsocket://0.0.0.0:3843</attribute>
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/ejb3-ssl-advanced/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 14:09:57 UTC (rev 60870)
@@ -2,7 +2,6 @@
<server>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
@@ -301,7 +300,6 @@
<!-- It binds the remoting invoker (transport protocol, callback configuration, -->
<!-- data marshalling, etc.) with the invocation handlers. -->
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,transport=socket3843,handler=ejb3">
display-name="Socket transport Connector">
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/resources/test-configs/invoker/deploy/ejb3.deployer/META-INF/jboss-service.xml 2007-02-24 14:09:57 UTC (rev 60870)
@@ -7,7 +7,6 @@
<server>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
<depends>jboss.aop:service=AspectDeployer</depends>
<attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
@@ -281,7 +280,6 @@
</mbean>
<mbean code="org.jboss.remoting.transport.Connector"
- xmbean-dd="org/jboss/remoting/transport/Connector.xml"
name="jboss.remoting:service=Connector,transport=Servlet"
display-name="Servlet transport Connector">
<depends>jboss.aop:service=AspectDeployer</depends>
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/interceptors2/AnnotatedOnlySLSB.java 2007-02-24 14:09:57 UTC (rev 60870)
@@ -32,6 +32,9 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.ejb3.StrictMaxPool;
+
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -41,6 +44,8 @@
@Remote(AnnotatedOnlySLSBRemote.class)
@Interceptors(AnnotatedClassInterceptor.class)
@ExcludeDefaultInterceptors
+// The default is ThreadlocalPool, which could lead to new constructs. Same goes for maxSize.
+ at PoolClass(value=StrictMaxPool.class, maxSize=1)
public class AnnotatedOnlySLSB implements AnnotatedOnlySLSBRemote
{
@EJB
@@ -81,14 +86,14 @@
@PostConstruct
void postConstruct()
{
- System.out.println("AnnotatedOnlySLSB postConstruct");
+ System.out.println("AnnotatedOnlySLSB postConstruct " + this);
StatusBean.addPostConstruct(new Interception(this, "postConstruct"));
}
@PreDestroy()
void preDestroy()
{
- System.out.println("AnnotatedOnlySLSB preDestroy!");
+ System.out.println("AnnotatedOnlySLSB preDestroy! " + this);
StatusBean.addPreDestroy(new Interception(this, "preDestroy"));
}
}
Modified: branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-02-24 09:42:15 UTC (rev 60869)
+++ branches/JBoss_4_0_5_EJB3_RC9_1_JBASS-4153/ejb3/src/test/org/jboss/ejb3/test/strictpool/unit/StrictPoolUnitTestCase.java 2007-02-24 14:09:57 UTC (rev 60870)
@@ -120,11 +120,11 @@
conn.start();
MessageProducer sender = session.createProducer(queueC);
TextMessage msg = session.createTextMessage("hello world");
- msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 20);
+ msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
sender.send(msg);
// the second message will timeout
TextMessage msg2 = session.createTextMessage("hello world 2");
- msg2.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 20);
+ msg2.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
sender.send(msg2);
Thread.sleep(5000);
More information about the jboss-cvs-commits
mailing list