You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2008/04/17 15:27:13 UTC

svn commit: r649089 - in /incubator/sling/trunk/scripting/javascript/src: main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java

Author: bdelacretaz
Date: Thu Apr 17 06:27:07 2008
New Revision: 649089

URL: http://svn.apache.org/viewvc?rev=649089&view=rev
Log:
SLING-382 - prevent Version class from being wrapped in a ScriptableNode

Modified:
    incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java

Modified: incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java?rev=649089&r1=649088&r2=649089&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingWrapFactory.java Thu Apr 17 06:27:07 2008
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 
 import org.mozilla.javascript.Context;
@@ -33,7 +34,7 @@
 
     public static final SlingWrapFactory INSTANCE = new SlingWrapFactory();
     
-    private static final Class<?>[] EXCLUDED_CLASSES = {VersionHistory.class};
+    private static final Class<?>[] EXCLUDED_CLASSES = {VersionHistory.class, Version.class};
 
     /** default log */
     private final Logger log = LoggerFactory.getLogger(getClass());

Modified: incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java?rev=649089&r1=649088&r2=649089&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/SlingWrapFactoryTest.java Thu Apr 17 06:27:07 2008
@@ -46,4 +46,11 @@
         assertNotNull(result);
     }
 
+    public void testVersionNotWrapped() throws Exception {
+        final ScriptEngineHelper.Data data = new ScriptEngineHelper.Data();
+        data.put("node", node);
+        Object result = script.eval("node.getBaseVersion().getCreated()", data);
+        assertNotNull(result);
+    }
+
 }