Repository: karaf Updated Branches: refs/heads/master 7d77078d0 -> 9cf7c426d
[KARAF-5148] Remove use of org.json replaced by org.apache.felix.utils.json Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9cf7c426 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9cf7c426 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9cf7c426 Branch: refs/heads/master Commit: 9cf7c426dbec0d078cfc8d7ac395ca95efdbbca8 Parents: 7d77078 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon May 29 13:50:44 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon May 29 13:51:15 2017 +0200 ---------------------------------------------------------------------- NOTICE | 4 - archetypes/assembly/NOTICE | 4 - archetypes/blueprint/NOTICE | 4 - archetypes/bundle/NOTICE | 4 - archetypes/command/NOTICE | 4 - archetypes/feature/NOTICE | 4 - archetypes/kar/NOTICE | 4 - bundle/core/NOTICE | 4 - bundle/springstate/NOTICE | 4 - client/NOTICE | 4 - config/NOTICE | 4 - demos/branding/NOTICE | 4 - demos/command/NOTICE | 4 - demos/deployer/bundle/NOTICE | 4 - demos/deployer/kar/NOTICE | 4 - demos/dump/NOTICE | 4 - demos/web/NOTICE | 4 - deployer/blueprint/NOTICE | 4 - deployer/features/NOTICE | 4 - deployer/kar/NOTICE | 4 - deployer/spring/NOTICE | 4 - deployer/wrap/NOTICE | 4 - diagnostic/boot/NOTICE | 4 - diagnostic/core/NOTICE | 4 - exception/NOTICE | 4 - features/command/NOTICE | 4 - features/core/NOTICE | 4 - http/NOTICE | 4 - instance/NOTICE | 4 - itests/NOTICE | 4 - jaas/boot/NOTICE | 4 - jaas/command/NOTICE | 4 - jaas/config/NOTICE | 4 - jaas/jasypt/NOTICE | 4 - jaas/modules/NOTICE | 4 - jdbc/NOTICE | 4 - jms/core/NOTICE | 4 - jndi/NOTICE | 4 - kar/NOTICE | 4 - log/NOTICE | 4 - main/NOTICE | 4 - management/server/NOTICE | 4 - obr/NOTICE | 4 - package/NOTICE | 4 - pom.xml | 7 -- scheduler/NOTICE | 4 - scr/command/NOTICE | 4 - scr/examples/component-factory/NOTICE | 4 - scr/examples/managed-service/NOTICE | 4 - scr/examples/service/NOTICE | 4 - scr/management/NOTICE | 4 - service/core/NOTICE | 4 - service/guard/NOTICE | 4 - shell/commands/NOTICE | 4 - shell/console/NOTICE | 4 - shell/core/NOTICE | 4 - shell/ssh/NOTICE | 4 - shell/table/NOTICE | 4 - subsystem/NOTICE | 4 - system/NOTICE | 4 - tooling/karaf-maven-plugin/NOTICE | 4 - util/NOTICE | 4 - web/NOTICE | 4 - webconsole/console/NOTICE | 4 - webconsole/console/pom.xml | 16 +--- webconsole/features/NOTICE | 4 - webconsole/features/pom.xml | 12 ++- .../webconsole/features/FeaturesPlugin.java | 72 ++++++++--------- webconsole/gogo/NOTICE | 4 - webconsole/gogo/pom.xml | 14 ++-- webconsole/http/NOTICE | 4 - webconsole/http/pom.xml | 14 ++-- .../karaf/webconsole/http/HttpPlugin.java | 82 +++++++++----------- webconsole/instance/NOTICE | 4 - webconsole/instance/pom.xml | 14 ++-- .../webconsole/instance/InstancePlugin.java | 9 +-- wrapper/NOTICE | 4 - 77 files changed, 111 insertions(+), 401 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index c0bab8d..a469b76 100644 --- a/NOTICE +++ b/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/assembly/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/assembly/NOTICE b/archetypes/assembly/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/assembly/NOTICE +++ b/archetypes/assembly/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/blueprint/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/blueprint/NOTICE b/archetypes/blueprint/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/blueprint/NOTICE +++ b/archetypes/blueprint/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/bundle/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/bundle/NOTICE b/archetypes/bundle/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/bundle/NOTICE +++ b/archetypes/bundle/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/command/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/command/NOTICE b/archetypes/command/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/command/NOTICE +++ b/archetypes/command/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/feature/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/feature/NOTICE b/archetypes/feature/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/feature/NOTICE +++ b/archetypes/feature/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/archetypes/kar/NOTICE ---------------------------------------------------------------------- diff --git a/archetypes/kar/NOTICE b/archetypes/kar/NOTICE index ae24949..f1f81e0 100644 --- a/archetypes/kar/NOTICE +++ b/archetypes/kar/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/bundle/core/NOTICE ---------------------------------------------------------------------- diff --git a/bundle/core/NOTICE b/bundle/core/NOTICE index ae24949..f1f81e0 100644 --- a/bundle/core/NOTICE +++ b/bundle/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/bundle/springstate/NOTICE ---------------------------------------------------------------------- diff --git a/bundle/springstate/NOTICE b/bundle/springstate/NOTICE index ae24949..f1f81e0 100644 --- a/bundle/springstate/NOTICE +++ b/bundle/springstate/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/client/NOTICE ---------------------------------------------------------------------- diff --git a/client/NOTICE b/client/NOTICE index ae24949..f1f81e0 100644 --- a/client/NOTICE +++ b/client/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/config/NOTICE ---------------------------------------------------------------------- diff --git a/config/NOTICE b/config/NOTICE index ae24949..f1f81e0 100644 --- a/config/NOTICE +++ b/config/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/branding/NOTICE ---------------------------------------------------------------------- diff --git a/demos/branding/NOTICE b/demos/branding/NOTICE index ae24949..f1f81e0 100644 --- a/demos/branding/NOTICE +++ b/demos/branding/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/command/NOTICE ---------------------------------------------------------------------- diff --git a/demos/command/NOTICE b/demos/command/NOTICE index ae24949..f1f81e0 100644 --- a/demos/command/NOTICE +++ b/demos/command/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/deployer/bundle/NOTICE ---------------------------------------------------------------------- diff --git a/demos/deployer/bundle/NOTICE b/demos/deployer/bundle/NOTICE index ae24949..f1f81e0 100644 --- a/demos/deployer/bundle/NOTICE +++ b/demos/deployer/bundle/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/deployer/kar/NOTICE ---------------------------------------------------------------------- diff --git a/demos/deployer/kar/NOTICE b/demos/deployer/kar/NOTICE index ae24949..f1f81e0 100644 --- a/demos/deployer/kar/NOTICE +++ b/demos/deployer/kar/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/dump/NOTICE ---------------------------------------------------------------------- diff --git a/demos/dump/NOTICE b/demos/dump/NOTICE index ae24949..f1f81e0 100644 --- a/demos/dump/NOTICE +++ b/demos/dump/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/demos/web/NOTICE ---------------------------------------------------------------------- diff --git a/demos/web/NOTICE b/demos/web/NOTICE index ae24949..f1f81e0 100644 --- a/demos/web/NOTICE +++ b/demos/web/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/deployer/blueprint/NOTICE ---------------------------------------------------------------------- diff --git a/deployer/blueprint/NOTICE b/deployer/blueprint/NOTICE index ae24949..f1f81e0 100644 --- a/deployer/blueprint/NOTICE +++ b/deployer/blueprint/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/deployer/features/NOTICE ---------------------------------------------------------------------- diff --git a/deployer/features/NOTICE b/deployer/features/NOTICE index ae24949..f1f81e0 100644 --- a/deployer/features/NOTICE +++ b/deployer/features/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/deployer/kar/NOTICE ---------------------------------------------------------------------- diff --git a/deployer/kar/NOTICE b/deployer/kar/NOTICE index ae24949..f1f81e0 100644 --- a/deployer/kar/NOTICE +++ b/deployer/kar/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/deployer/spring/NOTICE ---------------------------------------------------------------------- diff --git a/deployer/spring/NOTICE b/deployer/spring/NOTICE index ae24949..f1f81e0 100644 --- a/deployer/spring/NOTICE +++ b/deployer/spring/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/deployer/wrap/NOTICE ---------------------------------------------------------------------- diff --git a/deployer/wrap/NOTICE b/deployer/wrap/NOTICE index ae24949..f1f81e0 100644 --- a/deployer/wrap/NOTICE +++ b/deployer/wrap/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/diagnostic/boot/NOTICE ---------------------------------------------------------------------- diff --git a/diagnostic/boot/NOTICE b/diagnostic/boot/NOTICE index ae24949..f1f81e0 100644 --- a/diagnostic/boot/NOTICE +++ b/diagnostic/boot/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/diagnostic/core/NOTICE ---------------------------------------------------------------------- diff --git a/diagnostic/core/NOTICE b/diagnostic/core/NOTICE index ae24949..f1f81e0 100644 --- a/diagnostic/core/NOTICE +++ b/diagnostic/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/exception/NOTICE ---------------------------------------------------------------------- diff --git a/exception/NOTICE b/exception/NOTICE index ae24949..f1f81e0 100644 --- a/exception/NOTICE +++ b/exception/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/features/command/NOTICE ---------------------------------------------------------------------- diff --git a/features/command/NOTICE b/features/command/NOTICE index ae24949..f1f81e0 100644 --- a/features/command/NOTICE +++ b/features/command/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/features/core/NOTICE ---------------------------------------------------------------------- diff --git a/features/core/NOTICE b/features/core/NOTICE index ae24949..f1f81e0 100644 --- a/features/core/NOTICE +++ b/features/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/http/NOTICE ---------------------------------------------------------------------- diff --git a/http/NOTICE b/http/NOTICE index ae24949..f1f81e0 100644 --- a/http/NOTICE +++ b/http/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/instance/NOTICE ---------------------------------------------------------------------- diff --git a/instance/NOTICE b/instance/NOTICE index ae24949..f1f81e0 100644 --- a/instance/NOTICE +++ b/instance/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/itests/NOTICE ---------------------------------------------------------------------- diff --git a/itests/NOTICE b/itests/NOTICE index ae24949..f1f81e0 100644 --- a/itests/NOTICE +++ b/itests/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jaas/boot/NOTICE ---------------------------------------------------------------------- diff --git a/jaas/boot/NOTICE b/jaas/boot/NOTICE index ae24949..f1f81e0 100644 --- a/jaas/boot/NOTICE +++ b/jaas/boot/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jaas/command/NOTICE ---------------------------------------------------------------------- diff --git a/jaas/command/NOTICE b/jaas/command/NOTICE index ae24949..f1f81e0 100644 --- a/jaas/command/NOTICE +++ b/jaas/command/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jaas/config/NOTICE ---------------------------------------------------------------------- diff --git a/jaas/config/NOTICE b/jaas/config/NOTICE index ae24949..f1f81e0 100644 --- a/jaas/config/NOTICE +++ b/jaas/config/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jaas/jasypt/NOTICE ---------------------------------------------------------------------- diff --git a/jaas/jasypt/NOTICE b/jaas/jasypt/NOTICE index ae24949..f1f81e0 100644 --- a/jaas/jasypt/NOTICE +++ b/jaas/jasypt/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jaas/modules/NOTICE ---------------------------------------------------------------------- diff --git a/jaas/modules/NOTICE b/jaas/modules/NOTICE index ae24949..f1f81e0 100644 --- a/jaas/modules/NOTICE +++ b/jaas/modules/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jdbc/NOTICE ---------------------------------------------------------------------- diff --git a/jdbc/NOTICE b/jdbc/NOTICE index ae24949..f1f81e0 100644 --- a/jdbc/NOTICE +++ b/jdbc/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jms/core/NOTICE ---------------------------------------------------------------------- diff --git a/jms/core/NOTICE b/jms/core/NOTICE index ae24949..f1f81e0 100644 --- a/jms/core/NOTICE +++ b/jms/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/jndi/NOTICE ---------------------------------------------------------------------- diff --git a/jndi/NOTICE b/jndi/NOTICE index ae24949..f1f81e0 100644 --- a/jndi/NOTICE +++ b/jndi/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/kar/NOTICE ---------------------------------------------------------------------- diff --git a/kar/NOTICE b/kar/NOTICE index ae24949..f1f81e0 100644 --- a/kar/NOTICE +++ b/kar/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/log/NOTICE ---------------------------------------------------------------------- diff --git a/log/NOTICE b/log/NOTICE index ae24949..f1f81e0 100644 --- a/log/NOTICE +++ b/log/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/main/NOTICE ---------------------------------------------------------------------- diff --git a/main/NOTICE b/main/NOTICE index ae24949..f1f81e0 100644 --- a/main/NOTICE +++ b/main/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/management/server/NOTICE ---------------------------------------------------------------------- diff --git a/management/server/NOTICE b/management/server/NOTICE index ae24949..f1f81e0 100644 --- a/management/server/NOTICE +++ b/management/server/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/obr/NOTICE ---------------------------------------------------------------------- diff --git a/obr/NOTICE b/obr/NOTICE index ae24949..f1f81e0 100644 --- a/obr/NOTICE +++ b/obr/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/package/NOTICE ---------------------------------------------------------------------- diff --git a/package/NOTICE b/package/NOTICE index ae24949..f1f81e0 100644 --- a/package/NOTICE +++ b/package/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f3c527d..f35090a 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,6 @@ <org.osgi.service.jpa.version>1.0.0</org.osgi.service.jpa.version> <osgi.version>6.0.0</osgi.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> - <org.json.version>20150729</org.json.version> <pax.cdi.version>1.0.0.RC2</pax.cdi.version> <pax.exam.version>4.11.0</pax.exam.version> @@ -840,12 +839,6 @@ </dependency> <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>${org.json.version}</version> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>${javax.mail.version}</version> http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scheduler/NOTICE ---------------------------------------------------------------------- diff --git a/scheduler/NOTICE b/scheduler/NOTICE index ae24949..f1f81e0 100644 --- a/scheduler/NOTICE +++ b/scheduler/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scr/command/NOTICE ---------------------------------------------------------------------- diff --git a/scr/command/NOTICE b/scr/command/NOTICE index ae24949..f1f81e0 100644 --- a/scr/command/NOTICE +++ b/scr/command/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scr/examples/component-factory/NOTICE ---------------------------------------------------------------------- diff --git a/scr/examples/component-factory/NOTICE b/scr/examples/component-factory/NOTICE index ae24949..f1f81e0 100644 --- a/scr/examples/component-factory/NOTICE +++ b/scr/examples/component-factory/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scr/examples/managed-service/NOTICE ---------------------------------------------------------------------- diff --git a/scr/examples/managed-service/NOTICE b/scr/examples/managed-service/NOTICE index ae24949..f1f81e0 100644 --- a/scr/examples/managed-service/NOTICE +++ b/scr/examples/managed-service/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scr/examples/service/NOTICE ---------------------------------------------------------------------- diff --git a/scr/examples/service/NOTICE b/scr/examples/service/NOTICE index ae24949..f1f81e0 100644 --- a/scr/examples/service/NOTICE +++ b/scr/examples/service/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/scr/management/NOTICE ---------------------------------------------------------------------- diff --git a/scr/management/NOTICE b/scr/management/NOTICE index ae24949..f1f81e0 100644 --- a/scr/management/NOTICE +++ b/scr/management/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/service/core/NOTICE ---------------------------------------------------------------------- diff --git a/service/core/NOTICE b/service/core/NOTICE index ae24949..f1f81e0 100644 --- a/service/core/NOTICE +++ b/service/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/service/guard/NOTICE ---------------------------------------------------------------------- diff --git a/service/guard/NOTICE b/service/guard/NOTICE index ae24949..f1f81e0 100644 --- a/service/guard/NOTICE +++ b/service/guard/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/shell/commands/NOTICE ---------------------------------------------------------------------- diff --git a/shell/commands/NOTICE b/shell/commands/NOTICE index ae24949..f1f81e0 100644 --- a/shell/commands/NOTICE +++ b/shell/commands/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/shell/console/NOTICE ---------------------------------------------------------------------- diff --git a/shell/console/NOTICE b/shell/console/NOTICE index ae24949..f1f81e0 100644 --- a/shell/console/NOTICE +++ b/shell/console/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/shell/core/NOTICE ---------------------------------------------------------------------- diff --git a/shell/core/NOTICE b/shell/core/NOTICE index ae24949..f1f81e0 100644 --- a/shell/core/NOTICE +++ b/shell/core/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/shell/ssh/NOTICE ---------------------------------------------------------------------- diff --git a/shell/ssh/NOTICE b/shell/ssh/NOTICE index ae24949..f1f81e0 100644 --- a/shell/ssh/NOTICE +++ b/shell/ssh/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/shell/table/NOTICE ---------------------------------------------------------------------- diff --git a/shell/table/NOTICE b/shell/table/NOTICE index ae24949..f1f81e0 100644 --- a/shell/table/NOTICE +++ b/shell/table/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/subsystem/NOTICE ---------------------------------------------------------------------- diff --git a/subsystem/NOTICE b/subsystem/NOTICE index ae24949..f1f81e0 100644 --- a/subsystem/NOTICE +++ b/subsystem/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/system/NOTICE ---------------------------------------------------------------------- diff --git a/system/NOTICE b/system/NOTICE index ae24949..f1f81e0 100644 --- a/system/NOTICE +++ b/system/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/tooling/karaf-maven-plugin/NOTICE ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/NOTICE b/tooling/karaf-maven-plugin/NOTICE index 20edc73..ec9092f 100644 --- a/tooling/karaf-maven-plugin/NOTICE +++ b/tooling/karaf-maven-plugin/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/util/NOTICE ---------------------------------------------------------------------- diff --git a/util/NOTICE b/util/NOTICE index ae24949..f1f81e0 100644 --- a/util/NOTICE +++ b/util/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/web/NOTICE ---------------------------------------------------------------------- diff --git a/web/NOTICE b/web/NOTICE index ae24949..f1f81e0 100644 --- a/web/NOTICE +++ b/web/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/console/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/console/NOTICE b/webconsole/console/NOTICE index ae24949..f1f81e0 100644 --- a/webconsole/console/NOTICE +++ b/webconsole/console/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/console/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml index b6a4f6c..a31661b 100644 --- a/webconsole/console/pom.xml +++ b/webconsole/console/pom.xml @@ -35,7 +35,6 @@ <properties> <appendedResourcesDirectory>${project.basedir}/../../etc/appended-resources</appendedResourcesDirectory> - <org.json.version.osgi>0.0.0.${org.json.version}</org.json.version.osgi> </properties> <dependencies> @@ -85,12 +84,6 @@ <scope>provided</scope> <optional>true</optional> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> </dependencies> <build> @@ -131,8 +124,7 @@ <Export-Package> org.apache.felix.webconsole;version="${felix.webconsole.api.version}";provide:=true, org.apache.felix.webconsole.bundleinfo;version=1.0.0;provide:=true, - org.apache.felix.webconsole.i18n;version=1.0.0;provide:=true, - org.json;version="${org.json.version.osgi}" + org.apache.felix.webconsole.i18n;version=1.0.0;provide:=true </Export-Package> <Private-Package> !org.apache.felix.webconsole, @@ -169,12 +161,12 @@ org.apache.felix.webconsole;inline=**, <!-- Import/Export-Package parsing --> - org.apache.felix.utils;inline=org/apache/felix/utils/manifest/**, + org.apache.felix.utils.manifest;inline=org/apache/felix/utils/manifest/**, + org.apache.felix.utils.json;inline=org/apache/felix/utils/json/**, org.apache.felix.framework;inline=org/apache/felix/framework/util/VersionRange**, <!-- ServiceTracker --> - org.osgi.compendium; - inline=org/osgi/util/tracker/*, + org.osgi.compendium;inline=org/osgi/util/tracker/*, <!-- File Upload --> commons-fileupload, http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/features/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/features/NOTICE b/webconsole/features/NOTICE index ae24949..f1f81e0 100644 --- a/webconsole/features/NOTICE +++ b/webconsole/features/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/features/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/features/pom.xml b/webconsole/features/pom.xml index 65c5755..5992505 100644 --- a/webconsole/features/pom.xml +++ b/webconsole/features/pom.xml @@ -59,6 +59,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.karaf</groupId> <artifactId>org.apache.karaf.util</artifactId> <scope>provided</scope> @@ -72,10 +77,6 @@ <groupId>org.apache.karaf.features</groupId> <artifactId>org.apache.karaf.features.core</artifactId> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </dependency> </dependencies> <build> @@ -109,6 +110,9 @@ javax.servlet*;version=2.4, * </Import-Package> + <Private-Package> + org.apache.felix.utils.json + </Private-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java index 82a035c..ff87782 100644 --- a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java +++ b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java @@ -31,13 +31,12 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.felix.utils.json.JSONWriter; import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeaturesService; import org.apache.karaf.features.Repository; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.WebConsoleConstants; -import org.json.JSONException; -import org.json.JSONWriter; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -261,49 +260,44 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { final JSONWriter jw = new JSONWriter(pw); - try { - jw.object(); - - jw.key("status"); - jw.value(statusLine); + jw.object(); - jw.key("repositories"); - jw.array(); - for (Repository r : repositories) { - jw.object(); - jw.key("name"); - String name = ""; - if (r.getName() != null) - name = r.getName(); - jw.value(name); - jw.key("url"); - String uri = r.getURI().toString(); - jw.value(uri); - jw.key("actions"); - jw.array(); - boolean enable = true; - if (uri.startsWith("bundle")) { - enable = false; - } - action(jw, enable, "refreshRepository", "Refresh", "refresh"); - action(jw, enable, "removeRepository", "Remove", "delete"); - jw.endArray(); - jw.endObject(); - } - jw.endArray(); + jw.key("status"); + jw.value(statusLine); - jw.key("features"); + jw.key("repositories"); + jw.array(); + for (Repository r : repositories) { + jw.object(); + jw.key("name"); + String name = ""; + if (r.getName() != null) + name = r.getName(); + jw.value(name); + jw.key("url"); + String uri = r.getURI().toString(); + jw.value(uri); + jw.key("actions"); jw.array(); - for (ExtendedFeature f : features) { - featureInfo(jw, f); + boolean enable = true; + if (uri.startsWith("bundle")) { + enable = false; } + action(jw, enable, "refreshRepository", "Refresh", "refresh"); + action(jw, enable, "removeRepository", "Remove", "delete"); jw.endArray(); - jw.endObject(); + } + jw.endArray(); - } catch (JSONException je) { - throw new IOException(je.toString()); + jw.key("features"); + jw.array(); + for (ExtendedFeature f : features) { + featureInfo(jw, f); } + jw.endArray(); + + jw.endObject(); } @@ -389,7 +383,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { buf.append(msg); } - private void featureInfo(JSONWriter jw, ExtendedFeature feature) throws JSONException { + private void featureInfo(JSONWriter jw, ExtendedFeature feature) throws IOException { jw.object(); jw.key("id"); jw.value(feature.getId()); @@ -416,7 +410,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { jw.endObject(); } - private void action(JSONWriter jw, boolean enabled, String op, String title, String image) throws JSONException { + private void action(JSONWriter jw, boolean enabled, String op, String title, String image) throws IOException { jw.object(); jw.key("enabled").value(enabled); jw.key("op").value(op); http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/gogo/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/gogo/NOTICE b/webconsole/gogo/NOTICE index ae24949..f1f81e0 100644 --- a/webconsole/gogo/NOTICE +++ b/webconsole/gogo/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/gogo/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/gogo/pom.xml b/webconsole/gogo/pom.xml index e7f884e..d54a4b1 100644 --- a/webconsole/gogo/pom.xml +++ b/webconsole/gogo/pom.xml @@ -66,6 +66,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${servlet.spec.groupId}</groupId> <artifactId>${servlet.spec.artifactId}</artifactId> <scope>provided</scope> @@ -91,12 +96,6 @@ <artifactId>org.apache.karaf.util</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> </dependencies> <build> @@ -130,6 +129,9 @@ javax.servlet*;version=2.4, * </Import-Package> + <Private-Package> + org.apache.felix.utils.json + </Private-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/http/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/http/NOTICE b/webconsole/http/NOTICE index ae24949..f1f81e0 100644 --- a/webconsole/http/NOTICE +++ b/webconsole/http/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/http/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/http/pom.xml b/webconsole/http/pom.xml index 51629dd..e1d6eae 100644 --- a/webconsole/http/pom.xml +++ b/webconsole/http/pom.xml @@ -59,6 +59,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${servlet.spec.groupId}</groupId> <artifactId>${servlet.spec.artifactId}</artifactId> <scope>provided</scope> @@ -77,12 +82,6 @@ <artifactId>org.apache.karaf.util</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> </dependencies> <build> @@ -116,6 +115,9 @@ javax.servlet*;version=2.4, * </Import-Package> + <Private-Package> + org.apache.felix.utils.json + </Private-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java index b6fb060..2156f43 100644 --- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java +++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java @@ -31,10 +31,9 @@ import javax.servlet.Servlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.felix.utils.json.JSONWriter; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.WebConsoleConstants; -import org.json.JSONException; -import org.json.JSONWriter; import org.ops4j.pax.web.service.spi.ServletEvent; import org.ops4j.pax.web.service.spi.WebEvent; import org.osgi.framework.Bundle; @@ -149,57 +148,52 @@ public class HttpPlugin extends AbstractWebConsolePlugin { final String statusLine = this.getStatusLine(servlets, web); final JSONWriter jw = new JSONWriter(pw); - try { - jw.object(); - - jw.key("status"); - jw.value(statusLine); + jw.object(); - jw.key("contexts"); - jw.array(); - for (ServletDetails servlet : servlets) { - jw.object(); - jw.key("id"); - jw.value(servlet.getId()); - jw.key("servlet"); - jw.value(servlet.getServlet()); - jw.key("servletName"); - jw.value(servlet.getServletName()); - jw.key("state"); - jw.value(servlet.getState()); - jw.key("alias"); - jw.value(servlet.getAlias()); - jw.key("urls"); - jw.array(); - for (String url : servlet.getUrls()) { - jw.value(url); - } - jw.endArray(); - jw.endObject(); - } - jw.endArray(); + jw.key("status"); + jw.value(statusLine); - jw.key("web"); + jw.key("contexts"); + jw.array(); + for (ServletDetails servlet : servlets) { + jw.object(); + jw.key("id"); + jw.value(servlet.getId()); + jw.key("servlet"); + jw.value(servlet.getServlet()); + jw.key("servletName"); + jw.value(servlet.getServletName()); + jw.key("state"); + jw.value(servlet.getState()); + jw.key("alias"); + jw.value(servlet.getAlias()); + jw.key("urls"); jw.array(); - for (WebDetail webDetail : web) { - jw.object(); - jw.key("id"); - jw.value(webDetail.getBundleId()); - jw.key("bundlestate"); - jw.value(webDetail.getState()); - jw.key("contextpath"); - jw.value(webDetail.getContextPath()); - jw.key("state"); - jw.value(webDetail.getWebState()); - jw.endObject(); + for (String url : servlet.getUrls()) { + jw.value(url); } jw.endArray(); + jw.endObject(); + } + jw.endArray(); + jw.key("web"); + jw.array(); + for (WebDetail webDetail : web) { + jw.object(); + jw.key("id"); + jw.value(webDetail.getBundleId()); + jw.key("bundlestate"); + jw.value(webDetail.getState()); + jw.key("contextpath"); + jw.value(webDetail.getContextPath()); + jw.key("state"); + jw.value(webDetail.getWebState()); jw.endObject(); - } catch (JSONException je) { - throw new IOException(je.toString()); } + jw.endArray(); + jw.endObject(); } protected List<ServletDetails> getServletDetails() { http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/instance/NOTICE ---------------------------------------------------------------------- diff --git a/webconsole/instance/NOTICE b/webconsole/instance/NOTICE index ae24949..f1f81e0 100644 --- a/webconsole/instance/NOTICE +++ b/webconsole/instance/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/instance/pom.xml ---------------------------------------------------------------------- diff --git a/webconsole/instance/pom.xml b/webconsole/instance/pom.xml index 91b761a..66ef027 100644 --- a/webconsole/instance/pom.xml +++ b/webconsole/instance/pom.xml @@ -59,6 +59,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.utils</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${servlet.spec.groupId}</groupId> <artifactId>${servlet.spec.artifactId}</artifactId> <scope>provided</scope> @@ -73,12 +78,6 @@ <artifactId>org.apache.karaf.util</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> <!-- Only needed while running the unit tests --> <dependency> @@ -120,6 +119,9 @@ javax.servlet*;version=2.4, * </Import-Package> + <Private-Package> + org.apache.felix.utils.json + </Private-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java index 9752dcb..004803e 100644 --- a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java +++ b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java @@ -29,13 +29,12 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.felix.utils.json.JSONWriter; import org.apache.felix.webconsole.AbstractWebConsolePlugin; import org.apache.felix.webconsole.WebConsoleConstants; import org.apache.karaf.instance.core.Instance; import org.apache.karaf.instance.core.InstanceService; import org.apache.karaf.instance.core.InstanceSettings; -import org.json.JSONException; -import org.json.JSONWriter; import org.osgi.framework.BundleContext; import org.slf4j.LoggerFactory; @@ -224,14 +223,14 @@ public class InstancePlugin extends AbstractWebConsolePlugin { } jw.endArray(); jw.endObject(); - } catch (JSONException ex) { + } catch (IOException ex) { Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } catch (Exception ex) { Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } } - private void instanceInfo(JSONWriter jw, Instance instance) throws JSONException, Exception { + private void instanceInfo(JSONWriter jw, Instance instance) throws IOException, Exception { jw.object(); jw.key("pid"); jw.value(instance.getPid()); @@ -263,7 +262,7 @@ public class InstancePlugin extends AbstractWebConsolePlugin { jw.endObject(); } - private void action(JSONWriter jw, String op, String title, String image) throws JSONException { + private void action(JSONWriter jw, String op, String title, String image) throws IOException { jw.object(); jw.key("op").value(op); jw.key("title").value(title); http://git-wip-us.apache.org/repos/asf/karaf/blob/9cf7c426/wrapper/NOTICE ---------------------------------------------------------------------- diff --git a/wrapper/NOTICE b/wrapper/NOTICE index ae24949..f1f81e0 100644 --- a/wrapper/NOTICE +++ b/wrapper/NOTICE @@ -60,10 +60,6 @@ This product uses software developed at SpringSource (http://www.springsource.org/). Licensed under the Apache License 2.0. -This product includes software from http://www.json.org. -Copyright (c) 2002 JSON.org - - III. License Summary - Apache License 2.0 - BSD License
