[jboss-cvs] JBossAS SVN: r79760 - in trunk: testsuite/imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 20 15:39:18 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-10-20 15:39:17 -0400 (Mon, 20 Oct 2008)
New Revision: 79760
Modified:
trunk/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java
trunk/testsuite/imports/server-config.xml
Log:
[JBAS-6091] reapply r79490, server-config.xml part of r79491
Modified: trunk/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java 2008-10-20 18:55:22 UTC (rev 79759)
+++ trunk/server/src/main/org/jboss/invocation/jrmp/server/JRMPInvoker.java 2008-10-20 19:39:17 UTC (rev 79760)
@@ -46,11 +46,17 @@
import javax.naming.NameNotFoundException;
import javax.transaction.Transaction;
+import org.jboss.beans.metadata.api.annotations.Create;
+import org.jboss.beans.metadata.api.annotations.Destroy;
+import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.beans.metadata.api.annotations.Stop;
import org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.invocation.MarshalledValueInputStream;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
import org.jboss.logging.Logger;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.net.sockets.DefaultSocketFactory;
@@ -70,7 +76,7 @@
*/
public class JRMPInvoker
extends RemoteServer
- implements Invoker, JRMPInvokerMBean, MBeanRegistration
+ implements Invoker, JRMPInvokerMBean, MBeanRegistration, KernelControllerContextAware
{
/** @since 4.2.0 */
static final long serialVersionUID = 3110972460891691492L;
@@ -662,6 +668,40 @@
support.postDeregister();
}
+ public void setKernelControllerContext(KernelControllerContext context) throws Exception
+ {
+ support.setKernelControllerContext(context);
+ }
+
+ public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
+ {
+ support.unsetKernelControllerContext(context);
+ }
+
+ @Create
+ public void pojoCreate() throws Exception
+ {
+ support.pojoCreate();
+ }
+
+ @Start
+ public void pojoStart() throws Exception
+ {
+ support.pojoStart();
+ }
+
+ @Stop
+ public void pojoStop() throws Exception
+ {
+ support.pojoStop();
+ }
+
+ @Destroy
+ public void pojoDestroy() throws Exception
+ {
+ support.pojoDestroy();
+ }
+
interface TCLAction
{
class UTIL
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-10-20 18:55:22 UTC (rev 79759)
+++ trunk/testsuite/imports/server-config.xml 2008-10-20 19:39:17 UTC (rev 79760)
@@ -597,12 +597,14 @@
<sysproperty key="jboss.messaging.ServerPeerID" value="1" />
</server>
<server name="jrmp-invoker" host="${node0}">
- <jvmarg value="-Xmx128m" />
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=128m" />
<sysproperty key="java.net.preferIPv4Stack" value="true" />
</server>
<server name="pooled-invoker" host="${node0}">
- <jvmarg value="-Xmx128m" />
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
<jvmarg value="-XX:MaxPermSize=128m" />
<sysproperty key="java.net.preferIPv4Stack" value="true" />
</server>
More information about the jboss-cvs-commits
mailing list