JBoss Remoting SVN: r4198 - remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-17 15:30:25 -0400 (Sat, 17 May 2008)
New Revision: 4198
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java
Log:
JBREM-978: Removed unused imports.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java 2008-05-17 19:29:58 UTC (rev 4197)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java 2008-05-17 19:30:25 UTC (rev 4198)
@@ -21,12 +21,7 @@
*/
package org.jboss.remoting.detection.util;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
import org.apache.log4j.Level;
import org.jboss.logging.Logger;
16 years, 7 months
JBoss Remoting SVN: r4197 - remoting2/branches/2.x/src/main/org/jboss/remoting/network.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-17 15:29:58 -0400 (Sat, 17 May 2008)
New Revision: 4197
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistryQuery.java
Log:
JBREM-978: Removed unused imports.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistryQuery.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistryQuery.java 2008-05-17 19:27:41 UTC (rev 4196)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/network/NetworkRegistryQuery.java 2008-05-17 19:29:58 UTC (rev 4197)
@@ -22,10 +22,6 @@
package org.jboss.remoting.network;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
import javax.management.BadAttributeValueExpException;
import javax.management.BadBinaryOpValueExpException;
import javax.management.BadStringOperationException;
16 years, 7 months
JBoss Remoting SVN: r4196 - remoting2/branches/2.x.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-17 15:27:41 -0400 (Sat, 17 May 2008)
New Revision: 4196
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-920: Moved constructed policy files to output/tests.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-05-17 19:21:47 UTC (rev 4195)
+++ remoting2/branches/2.x/build.xml 2008-05-17 19:27:41 UTC (rev 4196)
@@ -358,29 +358,29 @@
<not><equals arg1="true" arg2="${enable.security.manager}"/></not>
</condition>
<property name="java.security.manager" value=""/>
- <property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/>
- <property name="java.security.policy.marshal" value="${etc.dir}/remoting.security.policy.marshal"/>
- <property name="java.security.policy.strict" value="${etc.dir}/remoting.security.policy.strict"/>
+ <property name="java.security.policy" value="${output.tests}/remoting.security.policy"/>
+ <property name="java.security.policy.marshal" value="${output.tests}/remoting.security.policy.marshal"/>
+ <property name="java.security.policy.strict" value="${output.tests}/remoting.security.policy.strict"/>
<!--<property name="java.security.manager" value="org.jboss.test.security.LoggingSecurityManager"/>-->
- <!--<property name="java.security.debug" value="access,failure"/>-->
+ <!--property name="java.security.debug" value="access,failure"/-->
<property name="java.security.debug" value=""/>
<!-- Create security policy file -->
- <concat destfile="${etc.dir}/remoting.security.policy">
+ <concat destfile="${output.tests}/remoting.security.policy">
<filelist dir="${etc.dir}"
files="remoting.security.policy.core,
remoting.security.policy.tests"/>
</concat>
<!-- Create strict security policy file -->
- <concat destfile="${etc.dir}/remoting.security.policy.strict">
+ <concat destfile="${output.tests}/remoting.security.policy.strict">
<filelist dir="${etc.dir}"
files="remoting.security.policy.core,
remoting.security.policy.tests.minimal"/>
</concat>
<!-- Create security policy file for tests.marshall -->
- <concat destfile="${etc.dir}/remoting.security.policy.marshal">
+ <concat destfile="${output.tests}/remoting.security.policy.marshal">
<filelist dir="${etc.dir}"
files="remoting.security.policy.core,
remoting.security.policy.tests.marshal"/>
16 years, 7 months
JBoss Remoting SVN: r4195 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-17 15:21:47 -0400 (Sat, 17 May 2008)
New Revision: 4195
Modified:
remoting2/branches/2.x/src/etc/
Log:
Seems to be an empty difference.
Property changes on: remoting2/branches/2.x/src/etc
___________________________________________________________________
Name: svn:ignore
+ remoting.security.policy
remoting.security.policy.marshal
remoting.security.policy.strict
16 years, 7 months
JBoss Remoting SVN: r4194 - remoting2/branches/2.x/src/etc.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-17 15:15:50 -0400 (Sat, 17 May 2008)
New Revision: 4194
Modified:
remoting2/branches/2.x/src/etc/remoting.security.policy.core
Log:
JBREM-920, JBREM-978: Added some documentation; commented out and modified some MBeanPermissions.
Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core
===================================================================
--- remoting2/branches/2.x/src/etc/remoting.security.policy.core 2008-05-17 02:47:01 UTC (rev 4193)
+++ remoting2/branches/2.x/src/etc/remoting.security.policy.core 2008-05-17 19:15:50 UTC (rev 4194)
@@ -31,7 +31,7 @@
//**** variation on the permissionslisted below, even if the calling code runs without
//**** these restrictions.
//****
-//**** There are two ways in which it may be necessary or desirable to modify the
+//**** There are a few ways in which it may be necessary or desirable to modify the
//**** the permissions listed below.
//****
//**** 1. It may be necessary to change the java.io.FilePermission permissions, according
@@ -45,8 +45,11 @@
//**** org.jboss.test.remoting.security.*ProxyTestCase test classes in the accompanying
//**** remoting.security.policy.tests file, which is used to run the Remoting test suite
//****
-//**** 3. Some permission may be eliminated, according to which Remoting facilities are used.
+//**** 3. Some facilities always use MBeans. The MBean permissions given below may be
+//**** restricted to particular ObjectNames.
//****
+//**** 4. Some permission may be eliminated, according to which Remoting facilities are used.
+//****
//**** Other than changes made according to items 1 and 2, it should not be necessary to grant
//**** any additional permissions.
//****
@@ -89,27 +92,23 @@
// MBean permissions
// // Some variation of the following might be needed if Remoting gets an MBean in place of an ordinary object.
-// permission javax.management.MBeanPermission "*#MBeanServer[*:*]", "setAttribute";
-//
-// // For example, if a Connector is configured with MBean ServerInvocationHandler:
-// permission javax.management.MBeanPermission "com.bluemonkey.ServerInvocationHandler#MBeanServer[*:*]", "setAttribute";
-//
-// // Some variation of the following might be needed if Remoting gets an MBean in place of an ordinary object.
-// //permission javax.management.MBeanPermission *#*[*:*]", "invoke, registerMBean, unregisterMBean";
-//
-// // For example, if a Connector is configured with an MBean ServerSocketFactory:
-// //permission javax.management.MBeanPermission "com.bluemonkey.ServerSocketFactory#createServerSocket[acme:type=serversocketfactory]", "invoke";
+// // See below for examples.
+// permission javax.management.MBeanPermission "*#*[*:*]", "getAttribute, setAttribute, invoke, registerMBean, unregisterMBean";
permission javax.management.MBeanTrustPermission "register";
- // Used by org.jboss.remoting.callback.ServerInvokerCallbackHandler
- permission javax.management.MBeanPermission "*#SSLSocketBuilder[*:*]", "getAttribute";
- permission javax.management.MBeanPermission "*#-[*:*]", "isInstanceOf";
+// // Some variation of the following is used by org.jboss.remoting.callback.ServerInvokerCallbackHandler
+// // if it is configured with an MBean which is a ServerSocketFactory.
+// permission javax.management.MBeanPermission "*#SSLSocketBuilder[*:*]", "getAttribute";
+
+// // Some variation of the following may be used by org.jboss.remoting.callback.ServerInvokerCallbackHandler,
+// // if it is configured with an MBean which is a ServerSocketFactory.
+// permission javax.management.MBeanPermission "*#-[*:*]", "isInstanceOf";
// Used by org.jboss.remoting.detection.AbstractDetector
- permission javax.management.MBeanPermission "*#addServer[remoting:type=NetworkRegistry]", "invoke";
- permission javax.management.MBeanPermission "*#updateServer[remoting:type=NetworkRegistry]", "invoke";
- permission javax.management.MBeanPermission "*#removeServer[remoting:type=NetworkRegistry]", "invoke";
+ permission javax.management.MBeanPermission "*#addServer[*:*]", "invoke";
+ permission javax.management.MBeanPermission "*#updateServer[*:*]", "invoke";
+ permission javax.management.MBeanPermission "*#removeServer[*:*]", "invoke";
permission javax.management.MBeanPermission "*#Servers[*:*]", "getAttribute";
// Used by org.jboss.remoting.detection.util.DetectorUtil
@@ -123,14 +122,26 @@
permission javax.management.MBeanPermission "-#ServerDataDir[jboss.system:type=ServerConfig]", "getAttribute";
// Used by org.jboss.remoting.network.NetworkRegistryFinder
+ // (which is used by org.jboss.remoting.detection.AbstractDetector)
permission javax.management.MBeanPermission "*#-[*:*]", "queryMBeans";
// Used by org.jboss.remoting.network.NetworkRegistryQuery
- permission javax.management.MBeanPermission "org.jboss.remoting.network.NetworkRegistry#-[*:*]", "isInstanceOf";
-
+ // (which is used by org.jboss.remoting.network.NetworkRegistryFinder)
+ permission javax.management.MBeanPermission "*#-[*:*]", "isInstanceOf";
+
// Used by org.jboss.remoting.transport.Connector
permission javax.management.MBeanPermission "org.jboss.remoting.transport.*#-[jboss.remoting:service=invoker,*]", "registerMBean, unregisterMBean";
-
+
+// // Some variation of the following would be necessary for org.jboss.remoting.transport.Connector
+// // if it is configured to use an MBean as an org.jboss.remoting.ServerInvocationHandler
+// permission javax.management.MBeanPermission "*#Invoker[*:*]", "setAttribute";
+// permission javax.management.MBeanPermission "*#MBeanServer[*:*]", "setAttribute";
+// permission javax.management.MBeanPermission "*#*[*:*]", "invoke";
+
+// // Some variation of the following would be necessary for subclasses of org.jboss.remoting.transport.ServerInvoker
+// // if they are configured with an MBean which is a ServerSocketFactory
+// permission javax.management.MBeanPermission "*#createServerSocket[*:*]", "invoke";
+
// Used by org.jboss.remoting.transport.servlet.web.ServerInvokerServlet
permission javax.management.MBeanServerPermission "findMBeanServer";
16 years, 7 months
JBoss Remoting SVN: r4193 - remoting2/branches/2.x/src/main/org/jboss/remoting/util.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-16 22:47:01 -0400 (Fri, 16 May 2008)
New Revision: 4193
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
Log:
JBREM-978: Added methods for ServerInvokerServlet.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-05-17 02:43:14 UTC (rev 4192)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/util/SecurityUtility.java 2008-05-17 02:47:01 UTC (rev 4193)
@@ -29,6 +29,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.InetAddress;
@@ -50,6 +51,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
@@ -57,12 +59,16 @@
import javax.management.ObjectName;
import javax.net.ServerSocketFactory;
import javax.net.SocketFactory;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.jboss.remoting.Remoting;
import org.jboss.remoting.security.ServerSocketFactoryMBean;
import org.jboss.remoting.transport.rmi.RMIServerInvoker;
import org.jboss.remoting.transport.rmi.RMIServerInvokerInf;
import org.jboss.remoting.transport.rmi.RemotingRMIClientSocketFactory;
+import org.jboss.remoting.transport.servlet.ServletServerInvokerMBean;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
@@ -123,6 +129,7 @@
return skipAccessControl;
}
+
///////////////////////////////////////////////////////////////////////////////////////
// FilePermission methods
///////////////////////////////////////////////////////////////////////////////////////
@@ -354,81 +361,125 @@
// MBeanPermission methods
///////////////////////////////////////////////////////////////////////////////////////
- static public void connect(final Socket socket, final InetSocketAddress address)
- throws IOException
+ static public MBeanServer createMBeanServer() throws Exception
{
if (skipAccessControl)
{
- socket.connect(address);
- return;
+ return MBeanServerFactory.createMBeanServer();
}
try
{
- AccessController.doPrivileged( new PrivilegedExceptionAction()
+ return (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
{
public Object run() throws Exception
{
- socket.connect(address);
- return null;
+ return MBeanServerFactory.createMBeanServer();
}
});
}
catch (PrivilegedActionException e)
{
- throw (IOException) e.getCause();
+ throw (Exception) e.getCause();
}
}
- static public void connect(final Socket socket, final InetSocketAddress address, final int timeout)
- throws IOException
+ static public ArrayList findMBeanServer(final String agentId)
{
if (skipAccessControl)
{
- socket.connect(address, timeout);
- return;
+ return MBeanServerFactory.findMBeanServer(agentId);
}
+ return (ArrayList)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return MBeanServerFactory.findMBeanServer(agentId);
+ }
+ });
+ }
+
+
+ static public Object getMBeanAttribute(final MBeanServer server, final ObjectName objectName, final String attribute)
+ throws Exception
+ {
+ if (skipAccessControl)
+ {
+ return server.getAttribute(objectName, attribute);
+ }
+
try
{
- AccessController.doPrivileged( new PrivilegedExceptionAction()
+ return AccessController.doPrivileged( new PrivilegedExceptionAction()
{
public Object run() throws Exception
{
- socket.connect(address, timeout);
- return null;
+ return server.getAttribute(objectName, attribute);
}
});
}
catch (PrivilegedActionException e)
{
- throw (IOException) e.getCause();
- }
+ throw (Exception) e.getCause();
+ }
}
- static public MBeanServer createMBeanServer() throws Exception
+ static public MBeanServer getPlatformMBeanServer()
+ throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
{
if (skipAccessControl)
{
- return MBeanServerFactory.createMBeanServer();
+ Class c = null;
+ try
+ {
+ c = Class.forName("java.lang.management.ManagementFactory");
+ }
+ catch (Exception e)
+ {
+ System.out.println("Unable to access java.lang.management.ManagementFactory: must be using jdk 1.4");
+ return null;
+ }
+ Method m = c.getMethod("getPlatformMBeanServer", new Class[] {});
+ MBeanServer s = (MBeanServer) m.invoke(null, new Object[] {});
+ return s;
}
try
{
return (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run()
+ throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
{
- return MBeanServerFactory.createMBeanServer();
+ Class c = null;
+ try
+ {
+ c = Class.forName("java.lang.management.ManagementFactory");
+ }
+ catch (Exception e)
+ {
+ System.out.println("Unable to access java.lang.management.ManagementFactory: must be using jdk 1.4");
+ return null;
+ }
+ Method m = c.getMethod("getPlatformMBeanServer", new Class[] {});
+ MBeanServer s = (MBeanServer) m.invoke(null, new Object[] {});
+ return s;
}
});
}
catch (PrivilegedActionException e)
{
- throw (Exception) e.getCause();
- }
+ Throwable cause = e.getCause();
+ if (cause instanceof NoSuchMethodException)
+ throw (NoSuchMethodException) cause;
+ else if (cause instanceof IllegalAccessException)
+ throw (IllegalAccessException) cause;
+ else
+ throw (InvocationTargetException) cause;
+ }
}
@@ -457,27 +508,34 @@
}
- static public Object getMBeanAttribute(final MBeanServer server, final ObjectName objectName, final String attribute)
- throws Exception
+ static public byte[] processRequest(final ServletServerInvokerMBean invoker,
+ final HttpServletRequest request,
+ final byte[] byteArray,
+ final HttpServletResponse response)
+ throws ServletException, IOException
{
if (skipAccessControl)
{
- return server.getAttribute(objectName, attribute);
+ return invoker.processRequest(request, byteArray, response);
}
try
{
- return AccessController.doPrivileged( new PrivilegedExceptionAction()
+ return (byte[]) AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- public Object run() throws Exception
+ public Object run() throws ServletException, IOException
{
- return server.getAttribute(objectName, attribute);
+ return invoker.processRequest(request, byteArray, response);
}
});
}
catch (PrivilegedActionException e)
{
- throw (Exception) e.getCause();
+ Throwable cause = e.getCause();
+ if (cause instanceof ServletException)
+ throw (ServletException) cause;
+ else
+ throw (IOException) e.getCause();
}
}
@@ -790,6 +848,7 @@
}
}
+
///////////////////////////////////////////////////////////////////////////////////////
// SocketPermission methods
///////////////////////////////////////////////////////////////////////////////////////
@@ -872,6 +931,60 @@
}
+ static public void connect(final Socket socket, final InetSocketAddress address)
+ throws IOException
+ {
+ if (skipAccessControl)
+ {
+ socket.connect(address);
+ return;
+ }
+
+ try
+ {
+ AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ socket.connect(address);
+ return null;
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+ }
+
+
+ static public void connect(final Socket socket, final InetSocketAddress address, final int timeout)
+ throws IOException
+ {
+ if (skipAccessControl)
+ {
+ socket.connect(address, timeout);
+ return;
+ }
+
+ try
+ {
+ AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws Exception
+ {
+ socket.connect(address, timeout);
+ return null;
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+ }
+
+
static public void connect(final HttpURLConnection conn) throws IOException
{
if (skipAccessControl)
16 years, 7 months
JBoss Remoting SVN: r4192 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-16 22:43:14 -0400 (Fri, 16 May 2008)
New Revision: 4192
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java
Log:
JBREM-978: Moved security sensitive code to SecurityUtility.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java 2008-05-17 02:39:45 UTC (rev 4191)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/web/ServerInvokerServlet.java 2008-05-17 02:43:14 UTC (rev 4192)
@@ -30,7 +30,6 @@
import org.jboss.remoting.util.SecurityUtility;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
import javax.management.MBeanServerInvocationHandler;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -43,11 +42,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.util.Iterator;
/**
@@ -129,8 +123,7 @@
}
byteOutputStream.flush();
byte[] totalByteArray = byteOutputStream.toByteArray();
-
- byte[] out = servletInvoker.processRequest(request, totalByteArray, response);
+ byte[] out = SecurityUtility.processRequest(servletInvoker, request, totalByteArray, response);
ServletOutputStream outStream = response.getOutputStream();
outStream.write(out);
outStream.flush();
@@ -274,27 +267,17 @@
{
try
{
- Class c = Class.forName("java.lang.management.ManagementFactory");
- Method m = SecurityUtility.getMethod(c, "getPlatformMBeanServer", new Class[] {});
- MBeanServer s = (MBeanServer) m.invoke(null, new Object[] {});
+ MBeanServer s = SecurityUtility.getPlatformMBeanServer();
log.debug("Using platform MBeanServer");
return s;
}
catch (Exception e)
{
- log.warn("Unable to access java.lang.management.ManagementFactory: must be using jdk 1.4");
mbeanServerId = "jboss";
}
}
- Iterator i = (Iterator) AccessController.doPrivileged( new PrivilegedAction()
- {
- public Object run()
- {
- return MBeanServerFactory.findMBeanServer(null).iterator();
- }
- });
-
+ Iterator i = SecurityUtility.findMBeanServer(null).iterator();
while(i.hasNext())
{
MBeanServer server = (MBeanServer) i.next();
16 years, 7 months
JBoss Remoting SVN: r4191 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/WEB-INF.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-16 22:39:45 -0400 (Fri, 16 May 2008)
New Revision: 4191
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/WEB-INF/web.xml
Log:
JBREM-978: Replaced multihome InvokerLocator.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/WEB-INF/web.xml 2008-05-13 19:06:43 UTC (rev 4190)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/WEB-INF/web.xml 2008-05-17 02:39:45 UTC (rev 4191)
@@ -16,9 +16,14 @@
<servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvokerServlet</servlet-class>
<init-param>
<param-name>invokerName</param-name>
- <param-value>jboss.remoting:service=invoker,transport=servlet,host=multihome,port=-1</param-value>
+ <param-value>jboss.remoting:host=localhost,port=8080,service=invoker,transport=servlet</param-value>
<description>The servlet server invoker</description>
</init-param>
+ <!--init-param>
+ <param-name>mbeanServer</param-name>
+ <param-value>*platform*</param-value>
+ <description>The servlet server invoker</description>
+ </init-param-->
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
16 years, 7 months
JBoss Remoting SVN: r4190 - remoting2/branches/2.x.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-13 15:06:43 -0400 (Tue, 13 May 2008)
New Revision: 4190
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-920: Changed enable.security.manager test to "true".
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-05-13 18:34:19 UTC (rev 4189)
+++ remoting2/branches/2.x/build.xml 2008-05-13 19:06:43 UTC (rev 4190)
@@ -350,12 +350,12 @@
<property name="perf.seq.dojava" value="yes"/>
<property name="perf.seq.dojboss" value="yes"/>
- <property name="enable.security.manager" value="yes"/>
+ <property name="enable.security.manager" value="true"/>
<condition property="java.security.manager.key" value="java.security.manager">
- <equals arg1="yes" arg2="${enable.security.manager}"/>
+ <equals arg1="true" arg2="${enable.security.manager}"/>
</condition>
<condition property="java.security.manager.key" value="dummy">
- <not><equals arg1="yes" arg2="${enable.security.manager}"/></not>
+ <not><equals arg1="true" arg2="${enable.security.manager}"/></not>
</condition>
<property name="java.security.manager" value=""/>
<property name="java.security.policy" value="${etc.dir}/remoting.security.policy"/>
16 years, 7 months
JBoss Remoting SVN: r4189 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/multihome.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-05-13 14:34:19 -0400 (Tue, 13 May 2008)
New Revision: 4189
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/multihome/SocketMultihomeTestCase.java
Log:
JBREM-920: Reduced log level to INFO.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/multihome/SocketMultihomeTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/multihome/SocketMultihomeTestCase.java 2008-05-13 18:33:55 UTC (rev 4188)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/multihome/SocketMultihomeTestCase.java 2008-05-13 18:34:19 UTC (rev 4189)
@@ -49,7 +49,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
16 years, 7 months