Author: kwright
Date: Fri Mar 24 00:45:47 2017
New Revision: 1788352
URL: http://svn.apache.org/viewvc?rev=1788352&view=rev
Log:
Start the process of removing json dependency
Modified:
manifoldcf/branches/CONNECTORS-1399/build.xml
manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/build.xml
manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/pom.xml
manifoldcf/branches/CONNECTORS-1399/connectors/confluence/pom.xml
manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/build.xml
manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/pom.xml
manifoldcf/branches/CONNECTORS-1399/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
manifoldcf/branches/CONNECTORS-1399/connectors/jira/pom.xml
manifoldcf/branches/CONNECTORS-1399/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
manifoldcf/branches/CONNECTORS-1399/dist-license/LICENSE.txt
manifoldcf/branches/CONNECTORS-1399/framework/build.xml
manifoldcf/branches/CONNECTORS-1399/framework/buildfiles/connector-build.xml
manifoldcf/branches/CONNECTORS-1399/framework/core/pom.xml
manifoldcf/branches/CONNECTORS-1399/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
manifoldcf/branches/CONNECTORS-1399/lib-license/LICENSE.txt
manifoldcf/branches/CONNECTORS-1399/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1399/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/build.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/build.xml Fri Mar 24 00:45:47 2017
@@ -37,7 +37,6 @@
<property name="xerces.version" value="2.10.0"/>
<property name="zookeeper.version" value="3.4.8"/>
<property name="mongodb.version" value="2.11.3"/>
- <property name="json.version" value="20160212"/>
<property name="postgresql.version" value="9.1-901.jdbc4"/>
<property name="axis.version" value="1.4"/>
<property name="saaj-api.version" value="1.3"/>
@@ -930,17 +929,6 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-json">
- <mkdir dir="lib"/>
- <antcall target="download-via-maven">
- <param name="project-path" value="org/json"/>
- <param name="artifact-version" value="${json.version}"/>
- <param name="target" value="lib"/>
- <param name="artifact-name" value="json"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- </target>
-
<target name="download-hsqldb">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -1782,6 +1770,16 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-json-simple">
+ <antcall target="download-via-maven">
+ <param name="target" value="lib"/>
+ <param name="project-path" value="com/googlecode/json-simple"/>
+ <param name="artifact-version" value="${json-simple.version}"/>
+ <param name="artifact-name" value="json-simple"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-dropbox-client">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -1791,13 +1789,6 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="dropbox-client"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven">
- <param name="target" value="lib"/>
- <param name="project-path" value="com/googlecode/json-simple"/>
- <param name="artifact-version" value="${json-simple.version}"/>
- <param name="artifact-name" value="json-simple"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
</target>
<target name="download-jira-client">
@@ -2523,7 +2514,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-forbidden-checks,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresq
l,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-forbidden-checks,download-json-simple,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-po
stgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/build.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/build.xml Fri Mar
24 00:45:47 2017
@@ -39,7 +39,6 @@
<include name="jackson-databind*.jar"/>
<include name="jackson-annotations*.jar"/>
<include name="joda-time*.jar"/>
- <include name="json-simple*.jar"/>
</fileset>
</path>
@@ -53,7 +52,6 @@
<include name="jackson-databind*.jar"/>
<include name="jackson-annotations*.jar"/>
<include name="joda-time*.jar"/>
- <include name="json-simple*.jar"/>
</fileset>
</copy>
</target>
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/amazons3/pom.xml Fri Mar 24
00:45:47 2017
@@ -392,11 +392,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${json.simple.version}</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/confluence/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/confluence/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/confluence/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/confluence/pom.xml Fri Mar
24 00:45:47 2017
@@ -358,11 +358,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/build.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/build.xml Fri Mar 24
00:45:47 2017
@@ -34,7 +34,6 @@
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="../../lib">
<include name="dropbox-client*.jar"/>
- <include name="json-simple*.jar"/>
</fileset>
</path>
@@ -43,7 +42,6 @@
<copy todir="dist/lib">
<fileset dir="../../lib">
<include name="dropbox*.jar"/>
- <include name="json-simple*.jar"/>
</fileset>
</copy>
</target>
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/dropbox/pom.xml Fri Mar 24
00:45:47 2017
@@ -231,12 +231,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
Fri Mar 24 00:45:47 2017
@@ -61,8 +61,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
import org.apache.manifoldcf.core.interfaces.VersionContext;
-import org.json.JSONException;
-import org.json.JSONObject;
/**
* This is the "output connector" for elasticsearch.
Modified: manifoldcf/branches/CONNECTORS-1399/connectors/jira/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/jira/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/connectors/jira/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/connectors/jira/pom.xml Fri Mar 24
00:45:47 2017
@@ -392,11 +392,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
Modified:
manifoldcf/branches/CONNECTORS-1399/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
Fri Mar 24 00:45:47 2017
@@ -51,8 +51,6 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.Specification;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
import org.apache.manifoldcf.core.interfaces.VersionContext;
-import org.json.JSONException;
-import org.json.JSONObject;
public class OpenSearchServerConnector extends BaseOutputConnector
{
Modified: manifoldcf/branches/CONNECTORS-1399/dist-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/dist-license/LICENSE.txt?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1399/dist-license/LICENSE.txt Fri Mar 24
00:45:47 2017
@@ -489,33 +489,6 @@ This product includes a curvesapi.jar: h
License: BSD License (http://opensource.org/licenses/BSD-3-Clause)
==========================================================================
-The following license applies to json.jar, which is generated from the json
-sources from http://www.json.org/java/index.html
---------------------------------------------------------------------------
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-==========================================================================
The following license applies to postgresql.jar, which is available from
http://jdbc.postgresql.org
--------------------------------------------------------------------------
Modified: manifoldcf/branches/CONNECTORS-1399/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/framework/build.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/framework/build.xml Fri Mar 24 00:45:47
2017
@@ -32,7 +32,7 @@
<path id="framework-classpath">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections-*.jar"/>
<include name="commons-el*.jar"/>
@@ -439,7 +439,7 @@
<copy todir="build/webapp/authority-service/WEB-INF/lib">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -478,7 +478,7 @@
<copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -523,7 +523,7 @@
<copy todir="build/webapp/api-service/WEB-INF/lib">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -563,7 +563,7 @@
<copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -610,7 +610,7 @@
<fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -658,7 +658,7 @@
<fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -714,7 +714,7 @@
<fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -764,7 +764,7 @@
<fileset dir="../lib">
<include name="jstl*.jar"/>
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -883,7 +883,7 @@
<copy todir="dist/lib">
<fileset dir="../lib">
<include name="zookeeper*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
@@ -1131,7 +1131,7 @@
<include name="commons-discovery*.jar"/>
<include name="jasper*.jar"/>
<include name="jsp-api-2.1-glassfish*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
<include name="javax.servlet-api*.jar"/>
@@ -1166,7 +1166,7 @@
<include name="commons-collections*.jar"/>
<include name="commons-io*.jar"/>
<include name="commons-logging*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
</fileset>
Modified:
manifoldcf/branches/CONNECTORS-1399/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/framework/buildfiles/connector-build.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/framework/buildfiles/connector-build.xml
(original)
+++
manifoldcf/branches/CONNECTORS-1399/framework/buildfiles/connector-build.xml
Fri Mar 24 00:45:47 2017
@@ -116,7 +116,7 @@
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="mail*.jar"/>
- <include name="json*.jar"/>
+ <include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-el*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-1399/framework/core/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/framework/core/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/framework/core/pom.xml Fri Mar 24
00:45:47 2017
@@ -57,6 +57,11 @@
<dependencies>
<dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json-simple.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponent.httpclient.version}</version>
@@ -67,11 +72,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${json.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
Modified:
manifoldcf/branches/CONNECTORS-1399/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1399/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
(original)
+++
manifoldcf/branches/CONNECTORS-1399/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
Fri Mar 24 00:45:47 2017
@@ -23,7 +23,10 @@ import java.util.*;
import java.io.*;
import org.apache.manifoldcf.core.system.ManifoldCF;
import org.apache.manifoldcf.core.common.XMLDoc;
-import org.json.*;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
/** This class represents XML configuration information, in its most basic
incarnation.
*/
@@ -163,99 +166,91 @@ public class Configuration implements IH
public String toJSON()
throws ManifoldCFException
{
- try
- {
- JSONWriter writer = new JSONStringer();
- writer.object();
- // We do NOT use the root node label, unlike XML.
+ JSONWriter writer = new JSONWriter();
+ writer.startObject();
+ // We do NOT use the root node label, unlike XML.
- // Now, do children. To get the arrays right, we need to glue together
all children with the
- // same type, which requires us to do an appropriate pass to gather that
stuff together.
- // Since we also need to maintain order, it is essential that we detect
the out-of-order condition
- // properly, and use an alternate representation if we should find it.
- Map<String,List<ConfigurationNode>> childMap = new
HashMap<String,List<ConfigurationNode>>();
- List<String> childList = new ArrayList<String>();
- String lastChildType = null;
- boolean needAlternate = false;
- int i = 0;
- while (i < getChildCount())
+ // Now, do children. To get the arrays right, we need to glue together
all children with the
+ // same type, which requires us to do an appropriate pass to gather that
stuff together.
+ // Since we also need to maintain order, it is essential that we detect
the out-of-order condition
+ // properly, and use an alternate representation if we should find it.
+ Map<String,List<ConfigurationNode>> childMap = new
HashMap<String,List<ConfigurationNode>>();
+ List<String> childList = new ArrayList<String>();
+ String lastChildType = null;
+ boolean needAlternate = false;
+ int i = 0;
+ while (i < getChildCount())
+ {
+ ConfigurationNode child = findChild(i++);
+ String key = child.getType();
+ List<ConfigurationNode> list = childMap.get(key);
+ if (list == null)
+ {
+ list = new ArrayList<ConfigurationNode>();
+ childMap.put(key,list);
+ childList.add(key);
+ }
+ else
{
- ConfigurationNode child = findChild(i++);
- String key = child.getType();
- List<ConfigurationNode> list = childMap.get(key);
- if (list == null)
+ if (!lastChildType.equals(key))
{
- list = new ArrayList<ConfigurationNode>();
- childMap.put(key,list);
- childList.add(key);
- }
- else
- {
- if (!lastChildType.equals(key))
- {
- needAlternate = true;
- break;
- }
+ needAlternate = true;
+ break;
}
- list.add(child);
- lastChildType = key;
}
+ list.add(child);
+ lastChildType = key;
+ }
- if (needAlternate)
+ if (needAlternate)
+ {
+ // Can't use the array representation. We'll need to start do a
_children_ object, and enumerate
+ // each child. So, the JSON will look like:
+ // <key>:{_attribute_<attr>:xxx,_children_:[{_type_:<child_key>,
...},{_type_:<child_key_2>, ...}, ...]}
+ writer.key(JSON_CHILDREN);
+ writer.startArray();
+ i = 0;
+ while (i < getChildCount())
{
- // Can't use the array representation. We'll need to start do a
_children_ object, and enumerate
- // each child. So, the JSON will look like:
- // <key>:{_attribute_<attr>:xxx,_children_:[{_type_:<child_key>,
...},{_type_:<child_key_2>, ...}, ...]}
- writer.key(JSON_CHILDREN);
- writer.array();
- i = 0;
- while (i < getChildCount())
- {
- ConfigurationNode child = findChild(i++);
- writeNode(writer,child,false,true);
- }
- writer.endArray();
+ ConfigurationNode child = findChild(i++);
+ writeNode(writer,child,false,true);
}
- else
+ writer.endArray();
+ }
+ else
+ {
+ // We can collapse child nodes to arrays and still maintain order.
+ // The JSON will look like this:
+ //
<key>:{_attribute_<attr>:xxx,<child_key>:[stuff],<child_key_2>:[more_stuff] ...}
+ int q = 0;
+ while (q < childList.size())
{
- // We can collapse child nodes to arrays and still maintain order.
- // The JSON will look like this:
- //
<key>:{_attribute_<attr>:xxx,<child_key>:[stuff],<child_key_2>:[more_stuff] ...}
- int q = 0;
- while (q < childList.size())
+ String key = childList.get(q++);
+ List<ConfigurationNode> list = childMap.get(key);
+ if (list.size() > 1)
{
- String key = childList.get(q++);
- List<ConfigurationNode> list = childMap.get(key);
- if (list.size() > 1)
- {
- // Write the key
- writer.key(key);
- // Write it as an array
- writer.array();
- i = 0;
- while (i < list.size())
- {
- ConfigurationNode child = list.get(i++);
- writeNode(writer,child,false,false);
- }
- writer.endArray();
- }
- else
+ // Write it as an array
+ writer.key(key);
+ writer.startArray();
+ i = 0;
+ while (i < list.size())
{
- // Write it as a singleton
- writeNode(writer,list.get(0),true,false);
+ ConfigurationNode child = list.get(i++);
+ writeNode(writer,child,false,false);
}
+ writer.endArray();
+ }
+ else
+ {
+ // Write it as a singleton
+ writeNode(writer,list.get(0),true,false);
}
}
- writer.endObject();
-
- // Convert to a string.
- return writer.toString();
- }
- catch (JSONException e)
- {
- throw new ManifoldCFException(e.getMessage(),e);
}
+ writer.endObject();
+
+ // Convert to a string.
+ return writer.toString();
}
/** Write a specification node.
@@ -299,138 +294,131 @@ public class Configuration implements IH
protected static void writeNode(JSONWriter writer, ConfigurationNode node,
boolean writeKey, boolean writeSpecialKey)
throws ManifoldCFException
{
- try
+ // Node types correspond directly to keys. Attributes correspond to
"_attribute_<attribute_name>".
+ // Get the type
+ if (writeKey)
{
- // Node types correspond directly to keys. Attributes correspond to
"_attribute_<attribute_name>".
- // Get the type
- if (writeKey)
- {
- String type = node.getType();
- writer.key(type);
- }
- else if (writeSpecialKey)
- {
- writer.object();
- writer.key(JSON_TYPE);
- writer.value(node.getType());
- }
+ String type = node.getType();
+ writer.key(type);
+ }
+ else if (writeSpecialKey)
+ {
+ writer.startObject();
+ writer.key(JSON_TYPE);
+ writer.value(node.getType());
+ }
- // Problem: Two ways of handling a naked 'value'. First way is to NOT
presume a nested object is needed. Second way is to require a nested
- // object. On reconstruction, the right thing will happen, and a naked
value will become a node with a value, while an object will become
- // a node that has an optional "_value_" key inside it.
- String value = node.getValue();
- if (value != null && node.getAttributeCount() == 0 &&
node.getChildCount() == 0)
+ // Problem: Two ways of handling a naked 'value'. First way is to NOT
presume a nested object is needed. Second way is to require a nested
+ // object. On reconstruction, the right thing will happen, and a naked
value will become a node with a value, while an object will become
+ // a node that has an optional "_value_" key inside it.
+ String value = node.getValue();
+ if (value != null && node.getAttributeCount() == 0 && node.getChildCount()
== 0)
+ {
+ writer.value(value);
+ }
+ else
+ {
+ if (!writeSpecialKey)
+ writer.startObject();
+
+ if (value != null)
{
+ writer.key(JSON_VALUE);
writer.value(value);
}
- else
- {
- if (!writeSpecialKey)
- writer.object();
-
- if (value != null)
- {
- writer.key(JSON_VALUE);
- writer.value(value);
- }
- Iterator<String> iter = node.getAttributes();
- while (iter.hasNext())
+ Iterator<String> iter = node.getAttributes();
+ while (iter.hasNext())
+ {
+ String attribute = iter.next();
+ String attrValue = node.getAttributeValue(attribute);
+ writer.key(JSON_ATTRIBUTE+attribute);
+ writer.value(attrValue);
+ }
+
+ // Now, do children. To get the arrays right, we need to glue together
all children with the
+ // same type, which requires us to do an appropriate pass to gather that
stuff together.
+ // Since we also need to maintain order, it is essential that we detect
the out-of-order condition
+ // properly, and use an alternate representation if we should find it.
+ Map<String,List<ConfigurationNode>> childMap = new
HashMap<String,List<ConfigurationNode>>();
+ List<String> childList = new ArrayList<String>();
+ String lastChildType = null;
+ boolean needAlternate = false;
+ int i = 0;
+ while (i < node.getChildCount())
+ {
+ ConfigurationNode child = node.findChild(i++);
+ String key = child.getType();
+ List<ConfigurationNode> list = childMap.get(key);
+ if (list == null)
{
- String attribute = iter.next();
- String attrValue = node.getAttributeValue(attribute);
- writer.key(JSON_ATTRIBUTE+attribute);
- writer.value(attrValue);
+ list = new ArrayList<ConfigurationNode>();
+ childMap.put(key,list);
+ childList.add(key);
}
-
- // Now, do children. To get the arrays right, we need to glue
together all children with the
- // same type, which requires us to do an appropriate pass to gather
that stuff together.
- // Since we also need to maintain order, it is essential that we detect
the out-of-order condition
- // properly, and use an alternate representation if we should find it.
- Map<String,List<ConfigurationNode>> childMap = new
HashMap<String,List<ConfigurationNode>>();
- List<String> childList = new ArrayList<String>();
- String lastChildType = null;
- boolean needAlternate = false;
- int i = 0;
- while (i < node.getChildCount())
+ else
{
- ConfigurationNode child = node.findChild(i++);
- String key = child.getType();
- List<ConfigurationNode> list = childMap.get(key);
- if (list == null)
- {
- list = new ArrayList<ConfigurationNode>();
- childMap.put(key,list);
- childList.add(key);
- }
- else
+ if (!lastChildType.equals(key))
{
- if (!lastChildType.equals(key))
- {
- needAlternate = true;
- break;
- }
+ needAlternate = true;
+ break;
}
- list.add(child);
- lastChildType = key;
}
+ list.add(child);
+ lastChildType = key;
+ }
- if (needAlternate)
+ if (needAlternate)
+ {
+ // Can't use the array representation. We'll need to start do a
_children_ object, and enumerate
+ // each child. So, the JSON will look like:
+ // <key>:{_attribute_<attr>:xxx,_children_:[{_type_:<child_key>,
...},{_type_:<child_key_2>, ...}, ...]}
+ writer.key(JSON_CHILDREN);
+ writer.startArray();
+ i = 0;
+ while (i < node.getChildCount())
{
- // Can't use the array representation. We'll need to start do a
_children_ object, and enumerate
- // each child. So, the JSON will look like:
- // <key>:{_attribute_<attr>:xxx,_children_:[{_type_:<child_key>,
...},{_type_:<child_key_2>, ...}, ...]}
- writer.key(JSON_CHILDREN);
- writer.array();
- i = 0;
- while (i < node.getChildCount())
- {
- ConfigurationNode child = node.findChild(i++);
- writeNode(writer,child,false,true);
- }
- writer.endArray();
+ ConfigurationNode child = node.findChild(i++);
+ writeNode(writer,child,false,true);
}
- else
+ writer.endArray();
+ }
+ else
+ {
+ // We can collapse child nodes to arrays and still maintain order.
+ // The JSON will look like this:
+ //
<key>:{_attribute_<attr>:xxx,<child_key>:[stuff],<child_key_2>:[more_stuff] ...}
+ int q = 0;
+ while (q < childList.size())
{
- // We can collapse child nodes to arrays and still maintain order.
- // The JSON will look like this:
- //
<key>:{_attribute_<attr>:xxx,<child_key>:[stuff],<child_key_2>:[more_stuff] ...}
- int q = 0;
- while (q < childList.size())
+ String key = childList.get(q++);
+ List<ConfigurationNode> list = childMap.get(key);
+ if (list.size() > 1)
{
- String key = childList.get(q++);
- List<ConfigurationNode> list = childMap.get(key);
- if (list.size() > 1)
- {
- // Write the key
- writer.key(key);
- // Write it as an array
- writer.array();
- i = 0;
- while (i < list.size())
- {
- ConfigurationNode child = list.get(i++);
- writeNode(writer,child,false,false);
- }
- writer.endArray();
- }
- else
+ // Write the key
+ writer.key(key);
+ // Write it as an array
+ writer.startArray();
+ i = 0;
+ while (i < list.size())
{
- // Write it as a singleton
- writeNode(writer,list.get(0),true,false);
+ ConfigurationNode child = list.get(i++);
+ writeNode(writer,child,false,false);
}
+ writer.endArray();
+ }
+ else
+ {
+ // Write it as a singleton
+ writeNode(writer,list.get(0),true,false);
}
}
- if (!writeSpecialKey)
- writer.endObject();
}
- if (writeSpecialKey)
+ if (!writeSpecialKey)
writer.endObject();
}
- catch (JSONException e)
- {
- throw new ManifoldCFException(e.getMessage(),e);
- }
+ if (writeSpecialKey)
+ writer.endObject();
}
/** Read from XML.
@@ -453,70 +441,59 @@ public class Configuration implements IH
throw new IllegalStateException("Attempt to change read-only object");
clearChildren();
- try
+ final JSONReader object = new JSONReader(json);
+ object.startObject();
+ // Convert the object into our configuration
+ final Iterator<String> iter = object.getKeys();
+ while (iter.hasNext())
{
- JSONObject object = new JSONObject(json);
- // Convert the object into our configuration
- Iterator iter = object.keys();
- while (iter.hasNext())
- {
- String key = (String)iter.next();
- Object x = object.opt(key);
- if (x instanceof JSONArray)
- {
- // Iterate through.
- JSONArray array = (JSONArray)x;
- int i = 0;
- while (i < array.length())
- {
- x = array.opt(i++);
- processObject(key,x);
- }
+ final String key = iter.next();
+ object.valueForKey(key);
+ if (object.isArray())
+ {
+ // Iterate through.
+ object.startArray();
+ while (object.nextElement()) {
+ processObject(key,object);
}
- else
- processObject(key,x);
+ object.endArray();
}
+ else
+ processObject(key,object);
}
- catch (JSONException e)
- {
- throw new ManifoldCFException("Json syntax error - "+e.getMessage(),e);
- }
+ object.endObject();
}
/** Process a JSON object */
- protected void processObject(String key, Object x)
+ protected void processObject(String key, JSONReader x)
throws ManifoldCFException
{
- if (x instanceof JSONObject)
+ if (x.isObject())
{
// Nested single object
- ConfigurationNode cn = readNode(key,(JSONObject)x);
+ ConfigurationNode cn = readNode(key,x);
addChild(getChildCount(),cn);
}
- else if (x == JSONObject.NULL)
+ else if (x.isNull())
{
// Null object. Don't enter the key.
}
else if (key.equals(JSON_CHILDREN))
{
// Children, as a list of separately enumerated child nodes.
- if (!(x instanceof JSONArray))
+ if (!(x.isArray()))
throw new ManifoldCFException("Expected array contents for
'"+JSON_CHILDREN+"' node");
- JSONArray array = (JSONArray)x;
- int i = 0;
- while (i < array.length())
- {
- Object z = array.opt(i++);
- if (!(z instanceof JSONObject))
- throw new ManifoldCFException("Expected object as array member");
- ConfigurationNode nestedCn = readNode((String)null,(JSONObject)z);
+ x.startArray();
+ while (x.nextElement()) {
+ ConfigurationNode nestedCn = readNode((String)null,x);
addChild(getChildCount(),nestedCn);
}
+ x.endArray();
}
else
{
// It's a string or a number or some scalar value
- String value = x.toString();
+ final String value = x.readValue();
ConfigurationNode cn = createNewNode(key);
cn.setValue(value);
addChild(getChildCount(),cn);
@@ -524,68 +501,63 @@ public class Configuration implements IH
}
/** Read a node from a json object */
- protected ConfigurationNode readNode(String key, JSONObject object)
+ protected ConfigurationNode readNode(String key, JSONReader object)
throws ManifoldCFException
{
+ object.startObject();
// Override key if type field is found.
- if (object.has(JSON_TYPE))
+ if (object.valueForKey(JSON_TYPE))
{
- try
- {
- key = object.getString(JSON_TYPE);
- }
- catch (JSONException e)
- {
- throw new ManifoldCFException("Exception decoding JSON:
"+e.getMessage());
+ if (!object.isValue()) {
+ throw new ManifoldCFException("JSON_TYPE key does not have a string
value");
}
+ key = object.readValue();
}
if (key == null)
throw new ManifoldCFException("No type found for node");
- Iterator iter;
- ConfigurationNode rval = createNewNode(key);
- iter = object.keys();
+ final ConfigurationNode rval = createNewNode(key);
+ final Iterator<String> iter = object.getKeys();
while (iter.hasNext())
{
- String nestedKey = (String)iter.next();
+ final String nestedKey = iter.next();
if (!nestedKey.equals(JSON_TYPE))
{
- Object x = object.opt(nestedKey);
- if (x instanceof JSONArray)
+ object.valueForKey(nestedKey);
+ if (object.isArray())
{
// Iterate through.
- JSONArray array = (JSONArray)x;
- int i = 0;
- while (i < array.length())
- {
- x = array.opt(i++);
- processObject(rval,nestedKey,x);
+ object.startArray();
+ while (object.nextElement()) {
+ processObject(rval,nestedKey,object);
}
+ object.endArray();
}
else
- processObject(rval,nestedKey,x);
+ processObject(rval,nestedKey,object);
}
}
+ object.endObject();
return rval;
}
/** Process a JSON object */
- protected void processObject(ConfigurationNode cn, String key, Object x)
+ protected void processObject(ConfigurationNode cn, String key, JSONReader x)
throws ManifoldCFException
{
- if (x instanceof JSONObject)
+ if (x.isObject())
{
// Nested single object
- ConfigurationNode nestedCn = readNode(key,(JSONObject)x);
+ ConfigurationNode nestedCn = readNode(key,x);
cn.addChild(cn.getChildCount(),nestedCn);
}
- else if (x == JSONObject.NULL)
+ else if (x.isNull())
{
// Null object. Don't enter the key.
}
else
{
// It's a string or a number or some scalar value
- String value = x.toString();
+ String value = x.readValue();
// Is it an attribute, or a value?
if (key.startsWith(JSON_ATTRIBUTE))
{
@@ -600,18 +572,15 @@ public class Configuration implements IH
else if (key.equals(JSON_CHILDREN))
{
// Children, as a list of separately enumerated child nodes.
- if (!(x instanceof JSONArray))
+ if (!(x.isArray()))
throw new ManifoldCFException("Expected array contents for
'"+JSON_CHILDREN+"' node");
- JSONArray array = (JSONArray)x;
- int i = 0;
- while (i < array.length())
- {
- Object z = array.opt(i++);
- if (!(z instanceof JSONObject))
- throw new ManifoldCFException("Expected object as array member");
- ConfigurationNode nestedCn = readNode((String)null,(JSONObject)z);
+
+ x.startArray();
+ while (x.nextElement()) {
+ ConfigurationNode nestedCn = readNode((String)null,x);
cn.addChild(cn.getChildCount(),nestedCn);
}
+ x.endArray();
}
else
{
@@ -797,4 +766,127 @@ public class Configuration implements IH
sb.append("]");
return sb.toString();
}
+
+ protected static class JSONWriter {
+
+ private final List<JSONObject> objectStack = new ArrayList<>();
+ private final List<String> keyStack = new ArrayList<>();
+ private final List<JSONArray> arrayStack = new ArrayList<>();
+ private JSONObject currentObject = null;
+ private JSONArray currentArray = null;
+ private String currentKey = null;
+ private JSONObject finalObject = null;
+
+ public JSONWriter() {
+ }
+
+ public void startObject() {
+ objectStack.add(currentObject);
+ keyStack.add(currentKey);
+ arrayStack.add(currentArray);
+ currentObject = new JSONObject();
+ currentKey = null;
+ currentArray = null;
+ }
+
+ public void key(final String key) {
+ currentKey = key;
+ }
+
+ public void value(final String value) {
+ currentObject.put(currentKey, value);
+ }
+
+ public void endObject() {
+ final JSONObject object = currentObject;
+ // Pop everything
+ currentObject = objectStack.remove(objectStack.size()-1);
+ currentKey = keyStack.remove(keyStack.size()-1);
+ currentArray = arrayStack.remove(arrayStack.size()-1);
+ // Either an array is active, or an object is active, or nothing is
active
+ if (currentObject != null) {
+ currentObject.put(currentKey, object);
+ } else if (currentArray != null) {
+ currentArray.add(object);
+ } else {
+ finalObject = object;
+ }
+ }
+
+ public void startArray() {
+ objectStack.add(currentObject);
+ keyStack.add(currentKey);
+ arrayStack.add(currentArray);
+ currentObject = null;
+ currentKey = null;
+ currentArray = new JSONArray();
+ }
+
+ public void endArray() {
+ final JSONArray array = currentArray;
+ // Pop everything
+ currentObject = objectStack.remove(objectStack.size()-1);
+ currentKey = keyStack.remove(keyStack.size()-1);
+ currentArray = arrayStack.remove(arrayStack.size()-1);
+ // Either an array is active, or an object is active, or nothing is
active
+ if (currentObject != null) {
+ currentObject.put(currentKey, array);
+ } else if (currentArray != null) {
+ currentArray.add(array);
+ } else {
+ throw new IllegalStateException("Top level entity can't be an array");
+ }
+ }
+
+ public String toString() {
+ if (finalObject == null) {
+ return "";
+ }
+ return finalObject.toJSONString();
+ }
+
+ }
+
+ protected static class JSONReader {
+
+ public JSONReader(final String json) throws ManifoldCFException {
+ }
+
+ public boolean isObject() {
+ }
+
+ public void startObject() {
+ }
+
+ public Iterator<String> getKeys() {
+ }
+
+ public boolean valueForKey(final String key) {
+ }
+
+ public void endObject() {
+ }
+
+ public boolean isArray() {
+ }
+
+ public void startArray() {
+ }
+
+ public boolean nextElement() {
+ }
+
+ public void endArray() {
+ }
+
+ public boolean isNull() {
+ }
+
+ public boolean isValue() {
+ }
+
+ public String readValue() {
+ }
+
+ }
}
Modified: manifoldcf/branches/CONNECTORS-1399/lib-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/lib-license/LICENSE.txt?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-1399/lib-license/LICENSE.txt Fri Mar 24
00:45:47 2017
@@ -498,33 +498,6 @@ This product includes a curvesapi.jar: h
License: BSD License (http://opensource.org/licenses/BSD-3-Clause)
==========================================================================
-The following license applies to json.jar, which is generated from the json
-sources from http://www.json.org/java/index.html
---------------------------------------------------------------------------
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-==========================================================================
The following license applies to postgresql.jar, which is available from
http://jdbc.postgresql.org
--------------------------------------------------------------------------
Modified: manifoldcf/branches/CONNECTORS-1399/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1399/pom.xml?rev=1788352&r1=1788351&r2=1788352&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1399/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1399/pom.xml Fri Mar 24 00:45:47 2017
@@ -77,7 +77,6 @@
<jstl.version>1.2</jstl.version>
<glassfish.version>2.1.v20091210</glassfish.version>
<log4j.version>1.2.16</log4j.version>
- <json.version>20160212</json.version>
<velocity.version>1.7</velocity.version>
<slf4j.version>1.7.7</slf4j.version>
<jaxb.version>2.2.6</jaxb.version>
