felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1782831 - in /felix/trunk/webconsole-plugins/script-console: ./ src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/
Date Mon, 13 Feb 2017 18:26:01 GMT
Author: cziegeler
Date: Mon Feb 13 18:26:00 2017
New Revision: 1782831

URL: http://svn.apache.org/viewvc?rev=1782831&view=rev
Log:
FELIX-5510 : Remove usage of org.json form web console plugins

Modified:
    felix/trunk/webconsole-plugins/script-console/changelog.txt
    felix/trunk/webconsole-plugins/script-console/pom.xml
    felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptConsolePlugin.java
    felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/ServerConfiguration.java

Modified: felix/trunk/webconsole-plugins/script-console/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/changelog.txt?rev=1782831&r1=1782830&r2=1782831&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/script-console/changelog.txt (original)
+++ felix/trunk/webconsole-plugins/script-console/changelog.txt Mon Feb 13 18:26:00 2017
@@ -1,3 +1,9 @@
+Changes from 1.0.2 to 1.0.4
+---------------------------
+** Improvement
+    * [FELIX-5510] - Remove usage of org.json form web console plugins
+
+
 Changes from 1.0.0 to 1.0.2
 ---------------------------
 ** Bug

Modified: felix/trunk/webconsole-plugins/script-console/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/pom.xml?rev=1782831&r1=1782830&r2=1782831&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/script-console/pom.xml (original)
+++ felix/trunk/webconsole-plugins/script-console/pom.xml Mon Feb 13 18:26:00 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>3</version>
+    <version>4</version>
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
@@ -55,31 +55,33 @@
     <url>http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console</url>
   </scm>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.5.3</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Category>osgi</Bundle-Category>
-            <Bundle-SymbolicName>
-              ${project.artifactId}
-            </Bundle-SymbolicName>
-            <Import-Package>
-                  org.json.*;version=0,
-                  javax.servlet.*;version=2.3,
-                  org.apache.commons.io; version="[1.4,3)",
-                  *
-            </Import-Package>
-            <Bundle-Activator>
-              org.apache.felix.webconsole.plugins.scriptconsole.internal.Activator
-            </Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.2.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Category>osgi</Bundle-Category>
+                        <Bundle-SymbolicName>
+                            ${project.artifactId}
+                        </Bundle-SymbolicName>
+                        <Import-Package>
+                           javax.servlet.*;version=2.3,
+                           org.apache.commons.io; version="[1.4,3)",
+                           *
+                        </Import-Package>
+                        <Bundle-Activator>
+                            org.apache.felix.webconsole.plugins.scriptconsole.internal.Activator
+                        </Bundle-Activator>
+                        <Embed-Dependency>
+                             org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
+                        </Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
@@ -198,15 +200,15 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20070829</version>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.utils</artifactId>
+      <version>1.9.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.1</version>
+      <version>1.3.2</version>
       <scope>provided</scope>
     </dependency>
 

Modified: felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptConsolePlugin.java?rev=1782831&r1=1782830&r2=1782831&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptConsolePlugin.java
(original)
+++ felix/trunk/webconsole-plugins/script-console/src/main/java/org/apache/felix/webconsole/plugins/scriptconsole/internal/ScriptConsolePlugin.java
Mon Feb 13 18:26:00 2017
@@ -20,12 +20,11 @@ package org.apache.felix.webconsole.plug
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.IOUtils;
+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;
 import org.apache.felix.webconsole.WebConsoleUtil;
-import org.json.JSONException;
-import org.json.JSONWriter;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -213,13 +212,13 @@ class ScriptConsolePlugin extends Simple
         {
             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);

Modified: felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/ServerConfiguration.java?rev=1782831&r1=1782830&r2=1782831&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/ServerConfiguration.java
(original)
+++ felix/trunk/webconsole-plugins/script-console/src/test/java/org/apache/felix/webconsole/plugins/scriptconsole/integration/ServerConfiguration.java
Mon Feb 13 18:26:00 2017
@@ -19,15 +19,20 @@
 
 package org.apache.felix.webconsole.plugins.scriptconsole.integration;
 
+import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
+import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+
+import java.io.File;
+
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.OptionUtils;
 
-import java.io.File;
-
-import static org.ops4j.pax.exam.CoreOptions.*;
-
 public class ServerConfiguration
 {
 
@@ -80,7 +85,6 @@ public class ServerConfiguration
                 mavenBundle("org.apache.felix", "org.apache.felix.webconsole").versionAsInProject(),
                 mavenBundle("commons-io", "commons-io").versionAsInProject(),
                 wrappedBundle(mavenBundle("commons-fileupload", "commons-fileupload").versionAsInProject()),
-                wrappedBundle(mavenBundle("org.json", "json").versionAsInProject()),
                 mavenBundle("org.codehaus.groovy", "groovy-all", "2.1.0"),
                 frameworkProperty("osgi.clean").value("true"),
 //            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),



Mime
View raw message