[xstream-scm] [2300] branches/v-1.4.x: Merge adjusted SecurityManagerTest.

[joehni]

Title: [2300] branches/v-1.4.x: Merge adjusted SecurityManagerTest.

Revision

2300

Author

joehni

Date

2014-10-02 13:00:26 -0500 (Thu, 02 Oct 2014)

Log Message

Merge adjusted SecurityManagerTest.

Modified Paths

• branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/SecurityManagerTest.java

Property Changed

branches/v-1.4.x/

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285,2291-2292,2294,2298-2299

Modified: branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/SecurityManagerTest.java (2299 => 2300)

--- branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/SecurityManagerTest.java	2014-09-25 08:07:29 UTC (rev 2299)
+++ branches/v-1.4.x/xstream/src/test/com/thoughtworks/acceptance/SecurityManagerTest.java	2014-10-02 18:00:26 UTC (rev 2300)
@@ -123,6 +123,7 @@
     }
 
     public void testSerializeWithXppDriverAndPureJavaReflectionProviderAndActiveSecurityManager() {
+        sm.addPermission(source, new RuntimePermission("accessClassInPackage.sun.misc"));
         sm.addPermission(source, new RuntimePermission("accessClassInPackage.sun.text.resources"));
         sm.addPermission(source, new RuntimePermission("accessClassInPackage.sun.util.resources"));
         sm.addPermission(source, new RuntimePermission("accessDeclaredMembers"));
@@ -138,6 +139,7 @@
         sm.addPermission(source, new PropertyPermission("jaxp.debug", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.util.TimeZone.allowSetDefault", "read"));
         sm.addPermission(source, new PropertyPermission("sun.boot.class.path", "read"));
+        sm.addPermission(source, new PropertyPermission("sun.io.serialization.extendedDebugInfo", "read"));
         sm.addPermission(source, new PropertyPermission("sun.nio.fs.chdirAllowed", "read"));
         sm.addPermission(source, new PropertyPermission("sun.timezone.ids.oldmapping", "read"));
         sm.addPermission(source, new PropertyPermission("user.country", "read"));
@@ -178,6 +180,7 @@
         sm.addPermission(source, new PropertyPermission("jdk.util.TimeZone.allowSetDefault", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.xml.elementAttributeLimit", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.xml.entityExpansionLimit", "read"));
+        sm.addPermission(source, new PropertyPermission("jdk.xml.maxElementDepth", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.xml.maxGeneralEntitySizeLimit", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.xml.maxParameterEntitySizeLimit", "read"));
         sm.addPermission(source, new PropertyPermission("jdk.xml.maxOccurLimit", "read"));

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email