Author: pauls
Date: Thu Jun 1 07:02:02 2017
New Revision: 1797143
URL: http://svn.apache.org/viewvc?rev=1797143&view=rev
Log:
SLING-6902: Remove commons.json from Apache Sling Script Console
Modified:
sling/trunk/contrib/scripting/script-console/pom.xml
sling/trunk/contrib/scripting/script-console/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java
Modified: sling/trunk/contrib/scripting/script-console/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/script-console/pom.xml?rev=1797143&r1=1797142&r2=1797143&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/script-console/pom.xml (original)
+++ sling/trunk/contrib/scripting/script-console/pom.xml Thu Jun 1 07:02:02
2017
@@ -56,6 +56,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>
+
org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -88,15 +95,21 @@
</reporting>
<dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -141,12 +154,6 @@
<version>2.0.4</version>
</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.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified:
sling/trunk/contrib/scripting/script-console/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/script-console/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java?rev=1797143&r1=1797142&r2=1797143&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/script-console/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java
(original)
+++
sling/trunk/contrib/scripting/script-console/src/main/java/org/apache/sling/scripting/console/internal/ScriptConsolePlugin.java
Thu Jun 1 07:02:02 2017
@@ -39,6 +39,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.utils.json.JSONWriter;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.apache.felix.webconsole.DefaultVariableResolver;
import org.apache.felix.webconsole.SimpleWebConsolePlugin;
@@ -46,8 +47,6 @@ import org.apache.felix.webconsole.WebCo
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScript;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.io.JSONWriter;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,15 +155,14 @@ public class ScriptConsolePlugin extends
private String getScriptConfig() {
try {
return getScriptConfig0();
- } catch (JSONException e) {
+ } catch (IOException e) {
throw new RuntimeException(e);
}
}
- private String getScriptConfig0() throws JSONException {
+ private String getScriptConfig0() throws IOException {
StringWriter sw = new StringWriter();
JSONWriter jw = new JSONWriter(sw);
- jw.setTidy(true);
jw.array();
for(ScriptEngineFactory sef :
scriptEngineManager.getEngineFactories()){
