[xstream-scm] [2235] branches/v-1.4.x: Merge removal of HibernateProxyTypePermission from trunk.

Tue, 28 Jan 2014 10:07:00 -0800

Title: [2235] branches/v-1.4.x: Merge removal of HibernateProxyTypePermission from trunk.
Revision
2235
Author
joehni
Date
2014-01-28 12:04:17 -0600 (Tue, 28 Jan 2014)

Log Message

Merge removal of HibernateProxyTypePermission from trunk.

Modified Paths



Removed Paths


    

  • branches/v-1.4.x/xstream-hibernate/src/java/com/thoughtworks/xstream/hibernate/security/
    • 




Property Changed

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,2216-2217,2226,2229,2231,2233-2234

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java (2234 => 2235)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java	2014-01-27 17:49:08 UTC (rev 2234)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java	2014-01-28 18:04:17 UTC (rev 2235)
@@ -9,7 +9,7 @@
 import com.thoughtworks.xstream.core.util.Primitives;
 
 /**
- * Permission for any primitive type and its boxed counterpart.
+ * Permission for any primitive type and its boxed counterpart (incl. void).
  * 
  * @author Jörg Schaible
  * @since upcoming

Modified: branches/v-1.4.x/xstream-distribution/src/content/security.html (2234 => 2235)


--- branches/v-1.4.x/xstream-distribution/src/content/security.html	2014-01-27 17:49:08 UTC (rev 2234)
+++ branches/v-1.4.x/xstream-distribution/src/content/security.html	2014-01-28 18:04:17 UTC (rev 2235)
@@ -167,11 +167,6 @@
 	    <td>&nbsp;</td>
 	</tr>
 	<tr>
-	    <td><a href=""
-	    <td>Allow any Hibernate proxy type.  Implementation is located in XStream's Hibernate extension.</td>
-	    <td>&nbsp;</td>
-	</tr>
-	<tr>
 	    <td><a href=""
 	    <td>Invert any other permission.  Instances of this type are used by XStream in the deny methods.</td>
 	    <td class="example">&nbsp;</td>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to