Author: ron.sigal(a)jboss.com Date: 2008-10-29 16:59:07 -0400 (Wed, 29 Oct 2008) New Revision: 4635 Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core remoting2/branches/2.x/src/etc/remoting.security.policy.tests Log: JBREM-1051: Moved http.proxy permissions from test file to core file. Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.core =================================================================== --- remoting2/branches/2.x/src/etc/remoting.security.policy.core 2008-10-29 20:57:19 UTC (rev 4634) +++ remoting2/branches/2.x/src/etc/remoting.security.policy.core 2008-10-29 20:59:07 UTC (rev 4635) @@ -243,8 +243,12 @@ permission java.util.PropertyPermission "tomcat.util.buf.StringCache.*", "read"; // Used by org.jboss.remoting.transport.http.HTTPClientInvoker + permission java.util.PropertyPermission "http.basic.username", "read"; permission java.util.PropertyPermission "http.basic.password", "read"; - permission java.util.PropertyPermission "http.basic.username", "read"; + permission java.util.PropertyPermission "http.proxy.username", "read"; + permission java.util.PropertyPermission "http.proxy.password", "read"; + permission java.util.PropertyPermission "http.proxyHost", "read"; + permission java.util.PropertyPermission "http.proxyPort", "read"; // Used by org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker permission java.util.PropertyPermission "org.jboss.security.ignoreHttpsHost" , "read"; Modified: remoting2/branches/2.x/src/etc/remoting.security.policy.tests =================================================================== --- remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-10-29 20:57:19 UTC (rev 4634) +++ remoting2/branches/2.x/src/etc/remoting.security.policy.tests 2008-10-29 20:59:07 UTC (rev 4635) @@ -71,12 +71,6 @@ permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#createServerSocket[jboss:type=serversocketfactory]", "invoke"; permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute"; permission javax.management.MBeanPermission "org.jboss.remoting.security.SSLServerSocketFactoryService#SSLSocketBuilder[jboss:type=serversocketfactory2]", "getAttribute"; - - // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase - permission java.util.PropertyPermission "http.proxyHost", "read"; - permission java.util.PropertyPermission "http.proxyPort", "read"; - permission java.util.PropertyPermission "http.proxy.username", "read"; - permission java.util.PropertyPermission "http.proxy.password", "read"; // org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.rmi.ssl.config.FactoryConfigTestCase$SerializableServerSocketFactory#SSLSocketBuilder[jboss:type=serversocketfactory]", "getAttribute"; @@ -101,6 +95,13 @@ // Subclasses of org.jboss.test.remoting.transport.config.FactoryConfigTestCaseParent and FactoryConfigTestCaseSSLParent // org.jboss.test.remoting.transport.{http,socket}.connection.socketfactory.by_mbean.SocketFactoryTestServer permission javax.management.MBeanPermission "org.jboss.test.remoting.transport.socket.connection.socketfactory.by_mbean.SocketFactoryTestServer$ServerSocketFactoryMock#createServerSocket[jboss:type=serversocketfactory]", "invoke"; + + // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase + permission java.util.PropertyPermission "http.proxyHost", "write"; + permission java.util.PropertyPermission "http.proxyPort", "write"; + permission java.util.PropertyPermission "proxySet", "write"; + permission java.util.PropertyPermission "http.proxy.username", "write"; + permission java.util.PropertyPermission "http.proxy.password", "write"; }; @@ -174,13 +175,6 @@ // org.jboss.test.remoting.transport.connector.ObjectNameWithZeroesAddressTestCase permission javax.management.MBeanPermission "*#-[*:*]", "queryMBeans"; - - // org.jboss.test.remoting.transport.http.proxy.ProxyAuthenticationTestCase - permission java.util.PropertyPermission "http.proxyHost", "write"; - permission java.util.PropertyPermission "http.proxyPort", "write"; - permission java.util.PropertyPermission "proxySet", "write"; - permission java.util.PropertyPermission "http.proxy.username", "write"; - permission java.util.PropertyPermission "http.proxy.password", "write"; // Several test cases. permission java.util.PropertyPermission "jrunit.bind_addr", "read";