You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/02/13 18:18:07 UTC
svn commit: r1782826 - in /felix/trunk/webconsole-plugins/deppack: LICENSE
NOTICE changelog.txt pom.xml
src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java
Author: cziegeler
Date: Mon Feb 13 18:18:07 2017
New Revision: 1782826
URL: http://svn.apache.org/viewvc?rev=1782826&view=rev
Log:
FELIX-5510 : Remove usage of org.json form web console plugins
Removed:
felix/trunk/webconsole-plugins/deppack/LICENSE
felix/trunk/webconsole-plugins/deppack/NOTICE
Modified:
felix/trunk/webconsole-plugins/deppack/changelog.txt
felix/trunk/webconsole-plugins/deppack/pom.xml
felix/trunk/webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java
Modified: felix/trunk/webconsole-plugins/deppack/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/deppack/changelog.txt?rev=1782826&r1=1782825&r2=1782826&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/deppack/changelog.txt (original)
+++ felix/trunk/webconsole-plugins/deppack/changelog.txt Mon Feb 13 18:18:07 2017
@@ -3,3 +3,4 @@ Initial Release 1.0.0
** Improvement
* [FELIX-3861] - Set felix.webconsole.category on Web Console plugins
+ * [FELIX-5510] - Remove usage of org.json form web console plugins
\ No newline at end of file
Modified: felix/trunk/webconsole-plugins/deppack/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/deppack/pom.xml?rev=1782826&r1=1782825&r2=1782826&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/deppack/pom.xml (original)
+++ felix/trunk/webconsole-plugins/deppack/pom.xml Mon Feb 13 18:18:07 2017
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>4</version>
<relativePath>../../../pom/pom.xml</relativePath>
</parent>
@@ -66,11 +66,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>src/main/resources/res/*.html</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -80,6 +92,9 @@
<Bundle-Activator>
org.apache.felix.webconsole.plugins.deppack.internal.Activator
</Bundle-Activator>
+ <Embed-Dependency>
+ org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -96,7 +111,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.3.2</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -119,11 +134,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: felix/trunk/webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java?rev=1782826&r1=1782825&r2=1782826&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java (original)
+++ felix/trunk/webconsole-plugins/deppack/src/main/java/org/apache/felix/webconsole/plugins/deppack/internal/WebConsolePlugin.java Mon Feb 13 18:18:07 2017
@@ -31,8 +31,7 @@ import org.apache.felix.webconsole.Defau
import org.apache.felix.webconsole.SimpleWebConsolePlugin;
import org.apache.felix.webconsole.WebConsoleUtil;
import org.apache.felix.webconsole.internal.Util;
-import org.json.JSONException;
-import org.json.JSONWriter;
+import org.apache.felix.utils.json.JSONWriter;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
import org.osgi.service.deploymentadmin.DeploymentPackage;
import org.osgi.util.tracker.ServiceTracker;
@@ -168,34 +167,27 @@ class WebConsolePlugin extends SimpleWeb
StringWriter w = new StringWriter();
PrintWriter w2 = new PrintWriter(w);
JSONWriter jw = new JSONWriter(w2);
- try
+ jw.object();
+ if (null == admin)
{
- jw.object();
- if (null == admin)
- {
- jw.key("error"); //$NON-NLS-1$
- jw.value(true);
- }
- else
- {
- final DeploymentPackage[] packages = admin.listDeploymentPackages();
- jw.key("data"); //$NON-NLS-1$
-
- jw.array();
- for (int i = 0; i < packages.length; i++)
- {
- packageInfoJson(jw, packages[i]);
- }
- jw.endArray();
+ jw.key("error"); //$NON-NLS-1$
+ jw.value(true);
+ }
+ else
+ {
+ final DeploymentPackage[] packages = admin.listDeploymentPackages();
+ jw.key("data"); //$NON-NLS-1$
+ jw.array();
+ for (int i = 0; i < packages.length; i++)
+ {
+ packageInfoJson(jw, packages[i]);
}
- jw.endObject();
+ jw.endArray();
}
- catch (JSONException je)
- {
- throw new IOException(je.toString());
- }
+ jw.endObject();
+
// prepare variables
DefaultVariableResolver vars = ((DefaultVariableResolver) WebConsoleUtil.getVariableResolver(request));
@@ -205,7 +197,7 @@ class WebConsolePlugin extends SimpleWeb
}
private static final void packageInfoJson(JSONWriter jw, DeploymentPackage pack)
- throws JSONException
+ throws IOException
{
jw.object();
jw.key("id"); //$NON-NLS-1$
@@ -231,10 +223,21 @@ class WebConsolePlugin extends SimpleWeb
jw.key("props"); //$NON-NLS-1$
jw.array();
- WebConsoleUtil.keyVal(jw, "Package Name", pack.getName());
- WebConsoleUtil.keyVal(jw, "Version", pack.getVersion());
+ jw.object();
+ jw.key("key");
+ jw.value("Package Name");
+ jw.key("value");
+ jw.value(pack.getName());
+ jw.endObject();
- final StringBuffer buffer = new StringBuffer();
+ jw.object();
+ jw.key("key");
+ jw.value("Version");
+ jw.key("value");
+ jw.value(pack.getVersion());
+ jw.endObject();
+
+ final StringBuilder buffer = new StringBuilder();
for (int i = 0; i < pack.getBundleInfos().length; i++)
{
buffer.append(pack.getBundleInfos()[i].getSymbolicName());
@@ -242,7 +245,12 @@ class WebConsolePlugin extends SimpleWeb
buffer.append(pack.getBundleInfos()[i].getVersion());
buffer.append("<br/>"); //$NON-NLS-1$
}
- WebConsoleUtil.keyVal(jw, "Bundles", buffer.toString());
+ jw.object();
+ jw.key("key");
+ jw.value("Bundles");
+ jw.key("value");
+ jw.value(buffer.toString());
+ jw.endObject();
jw.endArray();