JBossWS SVN: r11277 - framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-11 07:13:27 -0500 (Fri, 11 Dec 2009)
New Revision: 11277
Modified:
framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
[JBPAPP-3251] Optimize DefaultEndpoint.getTargetBeanClass()
Modified: framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 12:12:24 UTC (rev 11276)
+++ framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 12:13:27 UTC (rev 11277)
@@ -54,6 +54,7 @@
private String shortName;
private String urlPattern;
private String targetBean;
+ private Class<?> targetBeanClass;
private EndpointState state;
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
@@ -103,8 +104,10 @@
this.address = address;
}
- public Class<?> getTargetBeanClass()
+ public synchronized Class<?> getTargetBeanClass()
{
+ if (targetBeanClass != null)
+ return targetBeanClass;
if (targetBean == null)
throw new IllegalStateException("Target bean not set");
@@ -119,16 +122,15 @@
if (classLoader == null)
throw new IllegalStateException("Deployment classloader not set");
- Class<?> beanClass;
try
{
- beanClass = classLoader.loadClass(targetBean);
+ targetBeanClass = classLoader.loadClass(targetBean);
}
catch (ClassNotFoundException ex)
{
throw new WSFDeploymentException(ex);
}
- return beanClass;
+ return targetBeanClass;
}
public ObjectName getName()
14 years, 5 months
JBossWS SVN: r11276 - framework/branches/jbossws-framework-3.1.2.SP5/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-11 07:12:24 -0500 (Fri, 11 Dec 2009)
New Revision: 11276
Modified:
framework/branches/jbossws-framework-3.1.2.SP5/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
[JBPAPP-3251] Optimize DefaultEndpoint.getTargetBeanClass()
Modified: framework/branches/jbossws-framework-3.1.2.SP5/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2.SP5/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 11:28:09 UTC (rev 11275)
+++ framework/branches/jbossws-framework-3.1.2.SP5/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 12:12:24 UTC (rev 11276)
@@ -54,6 +54,7 @@
private String shortName;
private String urlPattern;
private String targetBean;
+ private Class<?> targetBeanClass;
private EndpointState state;
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
@@ -103,8 +104,10 @@
this.address = address;
}
- public Class<?> getTargetBeanClass()
+ public synchronized Class<?> getTargetBeanClass()
{
+ if (targetBeanClass != null)
+ return targetBeanClass;
if (targetBean == null)
throw new IllegalStateException("Target bean not set");
@@ -119,16 +122,15 @@
if (classLoader == null)
throw new IllegalStateException("Deployment classloader not set");
- Class<?> beanClass;
try
{
- beanClass = classLoader.loadClass(targetBean);
+ targetBeanClass = classLoader.loadClass(targetBean);
}
catch (ClassNotFoundException ex)
{
throw new WSFDeploymentException(ex);
}
- return beanClass;
+ return targetBeanClass;
}
public ObjectName getName()
14 years, 5 months
JBossWS SVN: r11275 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-11 06:28:09 -0500 (Fri, 11 Dec 2009)
New Revision: 11275
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
[JBWS-2859] optimizing DefaultEndpoint
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 11:25:48 UTC (rev 11274)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-12-11 11:28:09 UTC (rev 11275)
@@ -54,6 +54,7 @@
private String shortName;
private String urlPattern;
private String targetBean;
+ private Class<?> targetBeanClass;
private EndpointState state;
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
@@ -103,8 +104,10 @@
this.address = address;
}
- public Class<?> getTargetBeanClass()
+ public synchronized Class<?> getTargetBeanClass()
{
+ if (targetBeanClass != null)
+ return targetBeanClass;
if (targetBean == null)
throw new IllegalStateException("Target bean not set");
@@ -119,16 +122,15 @@
if (classLoader == null)
throw new IllegalStateException("Deployment classloader not set");
- Class<?> beanClass;
try
{
- beanClass = classLoader.loadClass(targetBean);
+ targetBeanClass = classLoader.loadClass(targetBean);
}
catch (ClassNotFoundException ex)
{
throw new WSFDeploymentException(ex);
}
- return beanClass;
+ return targetBeanClass;
}
public ObjectName getName()
14 years, 5 months
JBossWS SVN: r11274 - spi/trunk/src/main/java/org/jboss/wsf/spi/util.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-11 06:25:48 -0500 (Fri, 11 Dec 2009)
New Revision: 11274
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
Log:
[JBWS-2859] optimizing ServiceLoader
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-12-11 06:40:34 UTC (rev 11273)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/ServiceLoader.java 2009-12-11 11:25:48 UTC (rev 11274)
@@ -33,22 +33,21 @@
import java.util.Map;
import java.util.Properties;
import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
/**
* Load a service class using this ordered lookup procedure
*
* @author Thomas.Diesler(a)jboss.com
* @author alessio.soldano(a)jboss.com
+ * @author ropalka(a)redhat.com
* @since 14-Dec-2006
*/
public abstract class ServiceLoader
{
/**
- * A synchronized weak hash map that keeps factory names retrieved using Service API (META-INF/services/*) for each classloader.
- * Weak keys are used to remove entries when classloaders are garbage collected; values are service-property-name -> factory name maps.
+ * A synchronized weak hash map that keeps factory objects.
*/
- private static Map<ClassLoader, Map<String, String>> serviceMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String, String>>());
+ private static Map<String, Object> serviceMap = Collections.synchronizedMap(new WeakHashMap<String, Object>());
/**
* This method uses the algorithm below using the JAXWS Provider as an example.
@@ -67,15 +66,21 @@
*/
public static Object loadService(String propertyName, String defaultFactory)
{
- Object factory = loadFromServices(propertyName, null);
+ Object factory = serviceMap.get(propertyName);
if (factory == null)
{
- factory = loadFromPropertiesFile(propertyName, null);
+ factory = loadFromServices(propertyName, null);
+ if (factory == null)
+ {
+ factory = loadFromPropertiesFile(propertyName, null);
+ }
+ if (factory == null)
+ {
+ factory = loadFromSystemProperty(propertyName, defaultFactory);
+ }
+ if (factory != null)
+ serviceMap.put(propertyName, factory);
}
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
return factory;
}
@@ -115,29 +120,15 @@
private static String getServiceNameUsingCache(ClassLoader loader, String filename) throws IOException
{
- Map<String, String> map = serviceMap.get(loader);
- if (map != null && map.containsKey(filename))
+ InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
+ String factoryName = null;
+ if (inStream != null)
{
- return map.get(filename);
+ BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
+ factoryName = br.readLine();
+ br.close();
}
- else
- {
- if (map == null)
- {
- map = new ConcurrentHashMap<String, String>();
- serviceMap.put(loader, map);
- }
- InputStream inStream = SecurityActions.getResourceAsStream(loader, filename);
- String factoryName = null;
- if (inStream != null)
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- map.put(filename, factoryName);
- }
- return factoryName;
- }
+ return factoryName;
}
/** Use the system property
14 years, 5 months
JBossWS SVN: r11273 - in stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr: jboss-6.0.0-SNAPSHOT and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-11 01:40:34 -0500 (Fri, 11 Dec 2009)
New Revision: 11273
Added:
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy
Removed:
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/
Log:
[JBWS-2692]:Rename jboss-6.0.1.SNAPSHOT
Copied: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT (from rev 11265, stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT)
Property changes on: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy 2009-12-10 09:03:14 UTC (rev 11265)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy 2009-12-11 06:40:34 UTC (rev 11273)
@@ -1,354 +0,0 @@
-// The Java2 security policy for the securitymgr tests
-// Install with -Djava.security.policy==server.policy
-// and -Djboss.home.dir=path_to_jboss_distribution
-
-// ***************************************
-// Trusted core Java code
-//***************************************
-grant codeBase "file:${java.home}/lib/ext/-" {
- permission java.security.AllPermission;
-};
-grant codeBase "file:${java.home}/lib/*" {
- permission java.security.AllPermission;
-};
-// For java.home pointing to the JDK jre directory
-grant codeBase "file:${java.home}/../lib/*" {
- permission java.security.AllPermission;
-};
-
-
-
-
-//********************************************
-// Trusted core JBoss code (REAL URL Version)
-//********************************************
-grant codeBase "file:${jboss.home.dir}/bin/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.home.dir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.home.dir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.home.dir}/common/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.home.dir}/server/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deployers/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/work/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/log4j.jar!/" {
- permission java.lang.RuntimePermission "getClassLoader";
-};
-grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/servlet-api.jar!/" {
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-//********************************************
-// Trusted core JBoss code (VFS URL Version)
-//********************************************
-grant codeBase "vfszip:${jboss.home.dir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.home.dir}/common/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.home.dir}/server/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deployers/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/work/-" {
- permission java.security.AllPermission;
-};
-
-
-//*******************************************************
-// Trusted Specific JBoss Code (REAL URL Version)
-//*******************************************************
-grant codeBase "file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-bindingservice.jar/-"{
- permission java.io.FilePermission "${jboss.home.dir}/deploy/jbossweb.sar/server.xml", "read";
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
- permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jmx-remoting.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission java.net.SocketPermission "*", "accept,listen,resolve";
- permission java.lang.RuntimePermission "getClassLoader";
- permission java.util.logging.LoggingPermission "control";
-};
-
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/jsf-libs/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar/-" {
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-core.jar!/"{
- permission java.util.PropertyPermission "*", "write";
- permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
- permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-mgmt.jar!/"{
- permission java.util.PropertyPermission "*", "write";
- permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
- permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar!/jboss-local-jdbc.jar" {
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/management/console-mgr.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","*";
- permission java.io.FilePermission "<<ALL FILES>>", "read";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission javax.management.MBeanPermission "*", "getAttribute";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jms-ra.rar!/jms-ra.jar" {
- permission java.lang.RuntimePermission "setContextClassLoader";
- permission java.lang.RuntimePermission "getClassLoader";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
- permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
- permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jms-ra.rar/jms-ra.jar!/" {
- permission java.lang.RuntimePermission "setContextClassLoader";
- permission java.lang.RuntimePermission "getClassLoader";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
- permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
- permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/deploy/quartz-ra.rar!/quartz-ra.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "jar:file:${jboss.server.home.dir}/deploy/quartz-ra.rar/quartz-ra.jar!/" {
- permission java.security.AllPermission;
-};
-
-
-
-//*******************************************************
-// Trusted Specific JBoss Code (VFS URL Version)
-//*******************************************************
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
- permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
-};
-
-grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
- permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jmx-remoting.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission java.net.SocketPermission "*", "accept,listen,resolve";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jboss-web-service.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jbossweb.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/jbossweb.sar/jbossweb.jar/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jsf-libs/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jasper-jdt.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jstl.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar/-" {
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/management/console-mgr.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","*";
- permission java.io.FilePermission "<<ALL FILES>>", "read";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission javax.management.MBeanPermission "*", "getAttribute";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission javax.management.MBeanPermission "*", "getAttribute";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
- permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jms-ra.rar/jms-ra.jar" {
- permission java.lang.RuntimePermission "setContextClassLoader";
- permission java.lang.RuntimePermission "getClassLoader";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
- permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
- permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
-};
-
-grant codeBase "vfszip:${jboss.server.home.dir}/deploy/quartz-ra.rar/quartz-ra.jar" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "vfsmemory://*" {
- permission java.security.AllPermission;
-};
-
-//****************************************************************
-// jbossws cxf permission
-//****************************************************************
-//for juddi deployment
-grant codeBase "file:${jboss.server.home.dir}/deploy/juddi-service.sar/-" {
- permission javax.management.MBeanTrustPermission "register";
- permission org.jboss.naming.JndiPermission "JAXR", "rebind";
-};
-//for admin console- TODO:Review it
-grant codeBase "file:${jboss.server.home.dir}/deployers/jbossweb.deployer/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${jboss.server.home.dir}/deploy/admin-console.war/-" {
- permission java.security.AllPermission;
-};
-
-//****************************************************************
-// Default block of permissions
-// Minimal permissions are allowed to everyone else
-//****************************************************************
-grant {
- permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "read";
- permission java.io.FilePermission "${jboss.home.dir}/server/lib/quartz.jar/org/quartz/quartz.properties", "read";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
- permission java.io.FilePermission "quartz.properties", "read";
- permission java.util.PropertyPermission "*", "read";
- permission java.lang.RuntimePermission "queuePrintJob";
- permission java.net.SocketPermission "*", "connect";
- permission java.security.SecurityPermission "getPolicy";
- permission java.lang.RuntimePermission "accessClassInPackage.*";
- permission java.lang.RuntimePermission "getProtectionDomain";
- permission java.lang.RuntimePermission "org.jboss.security.SecurityAssociation.getSubject";
- permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getSubjectInfo";
-
- permission javax.management.MBeanServerPermission "findMBeanServer";
- permission javax.management.MBeanPermission "org.jboss.mx.modelmbean.XMBean#*[JMImplementation:type=MBeanRegistry]", "*";
- permission javax.management.MBeanPermission "org.jboss.security.plugins.AuthorizationManagerService#*[jboss.security:service=AuthorizationManager]", "invoke";
- permission javax.management.MBeanPermission "org.jboss.jms.server.jbosssx.JBossASSecurityMetadataStore#*[jboss.messaging:service=SecurityStore]", "invoke";
- permission javax.management.MBeanPermission "org.jboss.security.auth.login.XMLLoginConfig#*[jboss.security:service=XMLLoginConfig]", "invoke";
- permission javax.management.MBeanPermission "org.jboss.security.plugins.JaasSecurityManagerService#*[jboss.security:service=JaasSecurityManager]", "invoke";
- permission javax.management.MBeanPermission "*", "getMBeanInfo";
- permission javax.management.MBeanPermission "*", "getAttribute";
-
- permission javax.security.auth.AuthPermission "createLoginContext.*";
- permission javax.security.auth.AuthPermission "getLoginConfiguration";
-
- //admin-console
- permission java.lang.RuntimePermission "getClassLoader";
- permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","rebind,createSubcontext";
- permission java.util.logging.LoggingPermission "control";
- permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#-[JMImplementation:type=MBeanServerDelegate]", "addNotificationListener";
-
-
- // for org.jboss.test.ws.jaxws.cxf.webserviceref.WebServiceRefServletTestCase.testServletClient()
- permission java.io.FilePermission "<<ALL FILES>>", "read";
-
- //CXF annotation vistor uses reflection to process annotation
- permission java.lang.RuntimePermission "accessDeclaredMembers";
- permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-
- // for frameworktest org.jboss.test.ws.jaxws.smoke.tools.WSRunClientTestCase.test()
- permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getData";
-
- //add write permission to frameworktest : org.jboss.test.ws.jaxws.jbws2000.JBWS2000TestCase
- permission java.io.FilePermission "/tmp/-", "write,delete";
- //frameworktest : org.jboss.test.ws.jaxws.jbws1822.JBWS1822TestCase
- permission java.lang.RuntimePermission "createClassLoader";
- //Allow client to regiester MBean : org.jboss.test.ws.management.recording.CustomRecordProcessorTestCase.testAddCustomProcessor()
- permission javax.management.MBeanTrustPermission "register";
-
-};
Copied: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy (from rev 11270, stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy)
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy (rev 0)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/server.policy 2009-12-11 06:40:34 UTC (rev 11273)
@@ -0,0 +1,354 @@
+// The Java2 security policy for the securitymgr tests
+// Install with -Djava.security.policy==server.policy
+// and -Djboss.home.dir=path_to_jboss_distribution
+
+// ***************************************
+// Trusted core Java code
+//***************************************
+grant codeBase "file:${java.home}/lib/ext/-" {
+ permission java.security.AllPermission;
+};
+grant codeBase "file:${java.home}/lib/*" {
+ permission java.security.AllPermission;
+};
+// For java.home pointing to the JDK jre directory
+grant codeBase "file:${java.home}/../lib/*" {
+ permission java.security.AllPermission;
+};
+
+
+
+
+//********************************************
+// Trusted core JBoss code (REAL URL Version)
+//********************************************
+grant codeBase "file:${jboss.home.dir}/bin/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.home.dir}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.home.dir}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.home.dir}/common/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.home.dir}/server/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deployers/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/work/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/log4j.jar!/" {
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+grant codeBase "jar:file:${jboss.server.home.dir}/common/lib/servlet-api.jar!/" {
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+//********************************************
+// Trusted core JBoss code (VFS URL Version)
+//********************************************
+grant codeBase "vfszip:${jboss.home.dir}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.home.dir}/common/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.home.dir}/server/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deployers/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/work/-" {
+ permission java.security.AllPermission;
+};
+
+
+//*******************************************************
+// Trusted Specific JBoss Code (REAL URL Version)
+//*******************************************************
+grant codeBase "file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-bindingservice.jar/-"{
+ permission java.io.FilePermission "${jboss.home.dir}/deploy/jbossweb.sar/server.xml", "read";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
+ permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jmx-remoting.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission java.net.SocketPermission "*", "accept,listen,resolve";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission java.util.logging.LoggingPermission "control";
+};
+
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/jsf-libs/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar/-" {
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-core.jar!/"{
+ permission java.util.PropertyPermission "*", "write";
+ permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
+ permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/conf/bindingservice.beans/jboss-service-binding-mgmt.jar!/"{
+ permission java.util.PropertyPermission "*", "write";
+ permission java.io.FilePermission "${jboss.server.home.dir}/deploy/jbossweb.sar/server.xml", "read";
+ permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "write,delete";
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar!/jboss-local-jdbc.jar" {
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/management/console-mgr.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","*";
+ permission java.io.FilePermission "<<ALL FILES>>", "read";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission javax.management.MBeanPermission "*", "getAttribute";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jms-ra.rar!/jms-ra.jar" {
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
+ permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
+ permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/jms-ra.rar/jms-ra.jar!/" {
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
+ permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
+ permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/quartz-ra.rar!/quartz-ra.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "jar:file:${jboss.server.home.dir}/deploy/quartz-ra.rar/quartz-ra.jar!/" {
+ permission java.security.AllPermission;
+};
+
+
+
+//*******************************************************
+// Trusted Specific JBoss Code (VFS URL Version)
+//*******************************************************
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
+ permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
+};
+
+grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
+ permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/jmx-console.war/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jmx-remoting.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission java.net.SocketPermission "*", "accept,listen,resolve";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jboss-web-service.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jbossweb.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/jbossweb.sar/jbossweb.jar/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jsf-libs/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jasper-jdt.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jbossweb.sar/jstl.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jboss-local-jdbc.rar/-" {
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/management/console-mgr.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission javax.management.MBeanPermission "*", "addNotificationListener,getAttribute";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","*";
+ permission java.io.FilePermission "<<ALL FILES>>", "read";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission javax.management.MBeanPermission "*", "getAttribute";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "vfsfile:${jboss.server.home.dir}/deploy/uuid-key-generator.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission javax.management.MBeanPermission "*", "getAttribute";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup,rebind,unbind";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/jms-ra.rar/jms-ra.jar" {
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
+ permission java.io.FilePermission "${jboss.home.dir}/lib/jboss-aop.jar", "read";
+ permission javax.management.MBeanPermission "*", "getAttribute,invoke,setAttribute";
+};
+
+grant codeBase "vfszip:${jboss.server.home.dir}/deploy/quartz-ra.rar/quartz-ra.jar" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfsmemory://*" {
+ permission java.security.AllPermission;
+};
+
+//****************************************************************
+// jbossws cxf permission
+//****************************************************************
+//for juddi deployment
+grant codeBase "file:${jboss.server.home.dir}/deploy/juddi-service.sar/-" {
+ permission javax.management.MBeanTrustPermission "register";
+ permission org.jboss.naming.JndiPermission "JAXR", "rebind";
+};
+//for admin console- TODO:Review it
+grant codeBase "file:${jboss.server.home.dir}/deployers/jbossweb.deployer/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/jbossweb.sar/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/admin-console.war/-" {
+ permission java.security.AllPermission;
+};
+
+//****************************************************************
+// Default block of permissions
+// Minimal permissions are allowed to everyone else
+//****************************************************************
+grant {
+ permission java.io.FilePermission "${jboss.server.home.dir}/tmp/-", "read";
+ permission java.io.FilePermission "${jboss.home.dir}/server/lib/quartz.jar/org/quartz/quartz.properties", "read";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","lookup";
+ permission java.io.FilePermission "quartz.properties", "read";
+ permission java.util.PropertyPermission "*", "read";
+ permission java.lang.RuntimePermission "queuePrintJob";
+ permission java.net.SocketPermission "*", "connect";
+ permission java.security.SecurityPermission "getPolicy";
+ permission java.lang.RuntimePermission "accessClassInPackage.*";
+ permission java.lang.RuntimePermission "getProtectionDomain";
+ permission java.lang.RuntimePermission "org.jboss.security.SecurityAssociation.getSubject";
+ permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getSubjectInfo";
+
+ permission javax.management.MBeanServerPermission "findMBeanServer";
+ permission javax.management.MBeanPermission "org.jboss.mx.modelmbean.XMBean#*[JMImplementation:type=MBeanRegistry]", "*";
+ permission javax.management.MBeanPermission "org.jboss.security.plugins.AuthorizationManagerService#*[jboss.security:service=AuthorizationManager]", "invoke";
+ permission javax.management.MBeanPermission "org.jboss.jms.server.jbosssx.JBossASSecurityMetadataStore#*[jboss.messaging:service=SecurityStore]", "invoke";
+ permission javax.management.MBeanPermission "org.jboss.security.auth.login.XMLLoginConfig#*[jboss.security:service=XMLLoginConfig]", "invoke";
+ permission javax.management.MBeanPermission "org.jboss.security.plugins.JaasSecurityManagerService#*[jboss.security:service=JaasSecurityManager]", "invoke";
+ permission javax.management.MBeanPermission "*", "getMBeanInfo";
+ permission javax.management.MBeanPermission "*", "getAttribute";
+
+ permission javax.security.auth.AuthPermission "createLoginContext.*";
+ permission javax.security.auth.AuthPermission "getLoginConfiguration";
+
+ //admin-console
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission org.jboss.naming.JndiPermission "<<ALL BINDINGS>>","rebind,createSubcontext";
+ permission java.util.logging.LoggingPermission "control";
+ permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#-[JMImplementation:type=MBeanServerDelegate]", "addNotificationListener";
+
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ // for org.jboss.test.ws.jaxws.cxf.webserviceref.WebServiceRefServletTestCase.testServletClient()
+ permission java.io.FilePermission "<<ALL FILES>>", "read";
+
+ //CXF annotation vistor uses reflection to process annotation
+ permission java.lang.RuntimePermission "accessDeclaredMembers";
+ permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+
+ // for frameworktest org.jboss.test.ws.jaxws.smoke.tools.WSRunClientTestCase.test()
+ permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getData";
+
+ //add write permission to frameworktest : org.jboss.test.ws.jaxws.jbws2000.JBWS2000TestCase
+ permission java.io.FilePermission "/tmp/-", "write,delete";
+ //frameworktest : org.jboss.test.ws.jaxws.jbws1822.JBWS1822TestCase
+ permission java.lang.RuntimePermission "createClassLoader";
+ //Allow client to regiester MBean : org.jboss.test.ws.management.recording.CustomRecordProcessorTestCase.testAddCustomProcessor()
+ permission javax.management.MBeanTrustPermission "register";
+
+};
14 years, 5 months
JBossWS SVN: r11272 - in stack/native/trunk/modules/testsuite/src/test/resources/securityMgr: jboss-6.0.0-SNAPSHOT and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-11 01:37:24 -0500 (Fri, 11 Dec 2009)
New Revision: 11272
Added:
stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT/
Removed:
stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/
Log:
[JBWS-2692]:Rename jboss-6.0.1.SANPSHOT
Copied: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT (from rev 11271, stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT)
Property changes on: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0-SNAPSHOT
___________________________________________________________________
Name: svn:mergeinfo
+
14 years, 5 months
JBossWS SVN: r11271 - in stack/native/trunk/modules/testsuite/src/test/resources/securityMgr: jboss-6.0.0.M1 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-11 01:30:34 -0500 (Fri, 11 Dec 2009)
New Revision: 11271
Modified:
stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.0.1.GA/server.policy
stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy
stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy
Log:
[JBWS-2692]:Added setContextClassLoader permssion
Modified: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.0.1.GA/server.policy
===================================================================
--- stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.0.1.GA/server.policy 2009-12-11 05:18:07 UTC (rev 11270)
+++ stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.0.1.GA/server.policy 2009-12-11 06:30:34 UTC (rev 11271)
@@ -299,6 +299,7 @@
permission javax.management.MBeanPermission "*", "addNotificationListener";
//specific tests
+ permission java.lang.RuntimePermission "setContextClassLoader";
permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getData";
Modified: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy
===================================================================
--- stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy 2009-12-11 05:18:07 UTC (rev 11270)
+++ stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy 2009-12-11 06:30:34 UTC (rev 11271)
@@ -316,6 +316,7 @@
permission javax.management.MBeanPermission "*", "addNotificationListener";
//specific tests
+ permission java.lang.RuntimePermission "setContextClassLoader";
permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getData";
Modified: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy
===================================================================
--- stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy 2009-12-11 05:18:07 UTC (rev 11270)
+++ stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy 2009-12-11 06:30:34 UTC (rev 11271)
@@ -322,6 +322,7 @@
permission javax.management.MBeanPermission "*", "addNotificationListener";
//specific tests
+ permission java.lang.RuntimePermission "setContextClassLoader";
permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getData";
14 years, 5 months
JBossWS SVN: r11270 - in stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr: jboss-6.0.1.SNAPSHOT and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-11 00:18:07 -0500 (Fri, 11 Dec 2009)
New Revision: 11270
Modified:
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy
Log:
[JBWS-2692]:Added missing setContextClassLoader permission
Modified: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy 2009-12-10 10:15:22 UTC (rev 11269)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.0.M1/server.policy 2009-12-11 05:18:07 UTC (rev 11270)
@@ -326,6 +326,7 @@
permission java.util.logging.LoggingPermission "control";
permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#-[JMImplementation:type=MBeanServerDelegate]", "addNotificationListener";
+ permission java.lang.RuntimePermission "setContextClassLoader";
// for org.jboss.test.ws.jaxws.cxf.webserviceref.WebServiceRefServletTestCase.testServletClient()
permission java.io.FilePermission "<<ALL FILES>>", "read";
Modified: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy 2009-12-10 10:15:22 UTC (rev 11269)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-6.0.1.SNAPSHOT/server.policy 2009-12-11 05:18:07 UTC (rev 11270)
@@ -333,7 +333,7 @@
permission java.util.logging.LoggingPermission "control";
permission javax.management.MBeanPermission "javax.management.MBeanServerDelegate#-[JMImplementation:type=MBeanServerDelegate]", "addNotificationListener";
-
+ permission java.lang.RuntimePermission "setContextClassLoader";
// for org.jboss.test.ws.jaxws.cxf.webserviceref.WebServiceRefServletTestCase.testServletClient()
permission java.io.FilePermission "<<ALL FILES>>", "read";
14 years, 5 months
JBossWS SVN: r11269 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-10 05:15:22 -0500 (Thu, 10 Dec 2009)
New Revision: 11269
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
Log:
[JBPAPP-3241] Using new normalizer
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-10 10:14:42 UTC (rev 11268)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-10 10:15:22 UTC (rev 11269)
@@ -32,6 +32,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.wsf.common.Normalizer;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -137,7 +138,9 @@
else
{
if (normalize)
- valueStr = normalize(valueStr);
+ {
+ valueStr = Normalizer.normalize(valueStr);
+ }
xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
}
@@ -150,54 +153,4 @@
throw new NotImplementedException();
}
- private String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-10 10:14:42 UTC (rev 11268)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-10 10:15:22 UTC (rev 11269)
@@ -41,6 +41,7 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.common.Normalizer;
import org.w3c.dom.Element;
/**
@@ -166,7 +167,7 @@
private void consumeCharacters() throws SOAPException
{
- String text = normalize(reader.getText());
+ String text = Normalizer.normalize(reader.getText());
if (!atPartMargin() && !reader.isWhiteSpace())
{
@@ -416,57 +417,6 @@
return previousPart != currentPart;
}
- private static String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
-
public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
{
throw new NotImplementedException();
14 years, 5 months
JBossWS SVN: r11268 - in stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-10 05:14:42 -0500 (Thu, 10 Dec 2009)
New Revision: 11268
Modified:
stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
Log:
[JBPAPP-3241] using new normalizer
Modified: stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-10 09:50:46 UTC (rev 11267)
+++ stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-10 10:14:42 UTC (rev 11268)
@@ -32,6 +32,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.wsf.common.Normalizer;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -137,7 +138,9 @@
else
{
if (normalize)
- valueStr = normalize(valueStr);
+ {
+ valueStr = Normalizer.normalize(valueStr);
+ }
xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
}
@@ -150,54 +153,4 @@
throw new NotImplementedException();
}
- private String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-10 09:50:46 UTC (rev 11267)
+++ stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-10 10:14:42 UTC (rev 11268)
@@ -41,6 +41,7 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.common.Normalizer;
import org.w3c.dom.Element;
/**
@@ -166,7 +167,7 @@
private void consumeCharacters() throws SOAPException
{
- String text = normalize(reader.getText());
+ String text = Normalizer.normalize(reader.getText());
if (!atPartMargin() && !reader.isWhiteSpace())
{
@@ -416,57 +417,6 @@
return previousPart != currentPart;
}
- private static String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
-
public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
{
throw new NotImplementedException();
14 years, 5 months