You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/03/28 13:02:29 UTC
svn commit: r1789114 - in /sling/trunk/bundles/scripting/javascript: pom.xml
src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java
src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
Author: pauls
Date: Tue Mar 28 13:02:29 2017
New Revision: 1789114
URL: http://svn.apache.org/viewvc?rev=1789114&view=rev
Log:
SLING-6682: Replace commons.json usage in org.apache.sling.scripting.javascript
Modified:
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1789114&r1=1789113&r2=1789114&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue Mar 28 13:02:29 2017
@@ -127,12 +127,6 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.1.0</version>
<scope>provided</scope>
Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java?rev=1789114&r1=1789113&r2=1789114&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java (original)
+++ sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableCalendar.java Tue Mar 28 13:02:29 2017
@@ -19,11 +19,12 @@ package org.apache.sling.scripting.javas
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import java.util.Locale;
+
import org.apache.sling.scripting.javascript.SlingWrapper;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.Undefined;
-import org.apache.sling.commons.json.jcr.JsonItemWriter;
@SuppressWarnings("serial")
public class ScriptableCalendar extends ScriptableBase implements SlingWrapper {
@@ -31,6 +32,12 @@ public class ScriptableCalendar extends
public static final String CLASSNAME = "Calendar";
private SimpleDateFormat calendarFormat;
+ /** Used to format date values */
+ static final String ECMA_DATE_FORMAT = "EEE MMM dd yyyy HH:mm:ss 'GMT'Z";
+
+ /** The Locale used to format date values */
+ static final Locale DATE_FORMAT_LOCALE = Locale.US;
+
/** Calendar is a class, not an interface - so we need to enumerate possible implementations here */
private static final Class<?> [] WRAPPED_CLASSES = { Calendar.class, GregorianCalendar.class };
@@ -87,7 +94,7 @@ public class ScriptableCalendar extends
@Override
public String toString() {
if (calendarFormat == null) {
- calendarFormat = new SimpleDateFormat(JsonItemWriter.ECMA_DATE_FORMAT, JsonItemWriter.DATE_FORMAT_LOCALE);
+ calendarFormat = new SimpleDateFormat(ECMA_DATE_FORMAT, DATE_FORMAT_LOCALE);
}
return calendarFormat.format(calendar.getTime());
}
Modified: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java?rev=1789114&r1=1789113&r2=1789114&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java (original)
+++ sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java Tue Mar 28 13:02:29 2017
@@ -25,7 +25,6 @@ import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.Value;
-import org.apache.sling.commons.json.jcr.JsonItemWriter;
import org.apache.sling.scripting.javascript.RepositoryScriptingTestBase;
import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper;
@@ -146,7 +145,7 @@ public class ScriptableNodeTest extends
}
public void testViaNodeDirectPropertyAccessCal() throws Exception {
- final SimpleDateFormat f = new SimpleDateFormat(JsonItemWriter.ECMA_DATE_FORMAT, JsonItemWriter.DATE_FORMAT_LOCALE);
+ final SimpleDateFormat f = new SimpleDateFormat(ScriptableCalendar.ECMA_DATE_FORMAT, ScriptableCalendar.DATE_FORMAT_LOCALE);
final String expected = f.format(testCal.getTime());
assertEquals(
expected,