You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/02/28 19:32:20 UTC

svn commit: r1294761 - in /incubator/stanbol/trunk: cmsadapter/cmis/src/license/ cmsadapter/core/src/license/ cmsadapter/jcr/src/license/ cmsadapter/web/src/license/ commons/jobs/web/src/license/ commons/owl/src/license/ commons/stanboltools/datafilepr...

Author: rwesten
Date: Tue Feb 28 18:32:18 2012
New Revision: 1294761

URL: http://svn.apache.org/viewvc?rev=1294761&view=rev
Log:
corrected license of the servlet-api from Apache License 2.0 to Common Development And Distribution License (CDDL), Version 1.0

Added:
    incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties   (with props)
    incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties   (with props)
Modified:
    incubator/stanbol/trunk/cmsadapter/cmis/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/cmsadapter/core/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/cmsadapter/jcr/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/cmsadapter/web/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/jobs/web/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/owl/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/testing/http/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/testing/stanbol/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/web/base/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/web/home/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/commons/web/sparql/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/crawler/cnn/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/search/featured/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/search/solr/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/servicesapi/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/store/clerezza/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/store/inmemory/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/store/solr/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/contenthub/web/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/benchmark/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/chain/graph/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/chain/list/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/autotagging/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/geonames/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/langid/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/taxonomylinking/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/topic/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/engines/zemanta/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/generic/chainmanager/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/generic/enginemanager/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/generic/servicesapi/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/jersey/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/generic/core/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/generic/test/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/model/clerezza/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/yard/clerezza/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/entityhub/yard/solr/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/factstore/factstore/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/integration-tests/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/ontologymanager/ontonet/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/ontologymanager/registry/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/ontologymanager/web/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/rules/base/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/rules/manager/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/rules/refactor/src/license/THIRD-PARTY.properties
    incubator/stanbol/trunk/rules/web/src/license/THIRD-PARTY.properties

Modified: incubator/stanbol/trunk/cmsadapter/cmis/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/cmis/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/cmis/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/cmsadapter/cmis/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -23,7 +23,7 @@ com.sun.org.apache.xml.internal--resolve
 com.sun.xml.bind--jaxb-impl--2.1.11=Common Development And Distribution License (CDDL), Version 1.0
 com.sun.xml.messaging.saaj--saaj-impl--1.3.3=Common Development And Distribution License (CDDL), Version 1.0
 com.sun.xml.stream.buffer--streambuffer--0.9=Common Development And Distribution License (CDDL), Version 1.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 javax.xml.bind--jaxb-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
 javax.xml.soap--saaj-api--1.3=Common Development And Distribution License (CDDL), Version 1.0
 javax.xml.stream--stax-api--1.0=Common Development And Distribution License (CDDL), Version 1.0

Modified: incubator/stanbol/trunk/cmsadapter/core/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/core/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/core/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/cmsadapter/core/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -17,7 +17,7 @@
 #
 #
 #Wed Feb 15 19:02:23 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/cmsadapter/jcr/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/jcr/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/jcr/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/cmsadapter/jcr/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -17,7 +17,7 @@
 #
 #
 #Wed Feb 15 19:02:28 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/cmsadapter/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/web/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/web/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/cmsadapter/web/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -20,7 +20,7 @@
 #
 #Wed Feb 15 19:02:34 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/jobs/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/jobs/web/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/jobs/web/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/jobs/web/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:00:03 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/owl/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/owl/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/owl/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/owl/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -19,7 +19,7 @@
 #
 #Thu Feb 16 12:16:23 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -8,6 +8,6 @@
 #
 #
 #Wed Feb 15 19:00:07 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/testing/http/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/testing/http/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/testing/http/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/testing/http/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -9,5 +9,5 @@
 #
 #
 #Wed Feb 15 19:00:33 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/testing/stanbol/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/testing/stanbol/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/testing/stanbol/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/testing/stanbol/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -10,5 +10,5 @@
 #
 #
 #Wed Feb 15 19:00:35 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/web/base/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/web/base/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -21,7 +21,7 @@
 #
 #Thu Feb 16 11:15:59 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/web/home/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/home/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/home/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/web/home/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -16,7 +16,7 @@
 #
 #Wed Feb 15 19:00:20 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/commons/web/sparql/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/sparql/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/sparql/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/web/sparql/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:00:29 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/crawler/cnn/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/crawler/cnn/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/crawler/cnn/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/crawler/cnn/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -16,7 +16,7 @@
 #
 #
 #Wed Feb 15 19:03:24 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.ant--ant--1.7.0=The Apache Software License, Version 2.0
 org.apache.ant--ant-launcher--1.7.0=The Apache Software License, Version 2.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -30,7 +30,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/search/featured/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/featured/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/featured/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/search/featured/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -24,7 +24,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -16,7 +16,7 @@
 #
 #Mon Feb 20 17:43:53 CET 2012
 edu.smu.tspell--jaws--1.2=JAWS License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/search/solr/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/solr/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/solr/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/search/solr/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -24,7 +24,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/servicesapi/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/servicesapi/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/servicesapi/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/servicesapi/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -14,7 +14,7 @@
 #
 #
 #Thu Feb 16 11:44:08 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/store/clerezza/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/clerezza/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/clerezza/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/store/clerezza/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -22,7 +22,7 @@
 #
 #
 #Mon Feb 20 15:23:23 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.clerezza.scala--script-engine--0.1-incubating=The Apache Software License, Version 2.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/store/inmemory/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/inmemory/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/inmemory/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/store/inmemory/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -14,7 +14,7 @@
 #
 #
 #Wed Feb 15 19:03:01 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/store/solr/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/solr/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/solr/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/store/solr/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -24,7 +24,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/contenthub/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/web/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -29,7 +29,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.ant--ant--1.7.0=The Apache Software License, Version 2.0
 org.apache.ant--ant-launcher--1.7.0=The Apache Software License, Version 2.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/demos/webvie/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -17,7 +17,7 @@
 #
 #Tue Feb 21 15:51:07 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/benchmark/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -16,7 +16,7 @@
 antlr--antlr--2.7.2=Public Domain
 commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
 dom4j--dom4j--1.1=BSD-style
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
 oro--oro--2.0.8=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/allactive/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/allactive/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/chain/allactive/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:02:00 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/chain/graph/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/graph/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/graph/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/chain/graph/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:02:02 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/chain/list/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/list/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/list/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/chain/list/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:02:06 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/weighted/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/weighted/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/chain/weighted/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:02:04 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/autotagging/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/autotagging/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/autotagging/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/autotagging/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -16,7 +16,7 @@
 #
 #Wed Feb 15 19:05:57 CET 2012
 eu.iksproject--iks-autotagging-data--0.1.2=
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -13,6 +13,6 @@
 #
 #
 #Wed Feb 15 19:07:05 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,7 +12,7 @@
 #
 #
 #Wed Feb 15 19:07:03 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/langid/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/langid/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/langid/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/langid/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:06:13 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -24,7 +24,7 @@
 com.drewnoakes--metadata-extractor--2.4.0-beta1.bundle=The Apache Software License, Version 2.0
 com.sun.xml.bind--jaxb-impl--2.1.9.bundle=CDDL v1.1
 dom4j--dom4j--1.6.1=BSD style license
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 javax.xml.bind--jaxb-api--2.1.9.v200905050702_orbit=CDDL v1.1
 mp3agic--mp3agic--0.6=MIT License
 net.fortuna.ical4j--ical4j-vcard--0.9.3.ant20100406=iCal4j - License

Modified: incubator/stanbol/trunk/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -15,7 +15,7 @@
 #
 #
 #Wed Feb 15 19:07:17 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
 xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,7 +12,7 @@
 #
 #
 #Wed Feb 15 19:06:02 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jwnl--jwnl--1.3.3=BSD License
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/taxonomylinking/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/taxonomylinking/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/taxonomylinking/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/taxonomylinking/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -13,7 +13,7 @@
 #
 #
 #Wed Feb 15 19:07:14 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jwnl--jwnl--1.3.3=BSD License
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Added: incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties?rev=1294761&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties (added)
+++ incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -0,0 +1,29 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - (MIT-style) netCDF C library license.
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Bouncy Castle Licence
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - ICU License
+# - MIT License
+# - Public Domain License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Tue Feb 28 09:40:11 CET 2012
+asm--asm--3.1=Public Domain License
+dom4j--dom4j--1.6.1=BSD style license
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+jdom--jdom--1.0=Apache Software License, Version 2.0
+org.osgi--org.osgi.compendium--4.1.0=Apache Software License, Version 2.0
+org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0

Propchange: incubator/stanbol/trunk/enhancer/engines/tika/src/license/THIRD-PARTY.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1294761&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties Tue Feb 28 18:32:18 2012
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+stanbol.enhancer.engine.name.name=Name
+stanbol.enhancer.engine.name.description=The name of the enhancement engine as \
+used in the RESTful interface '/engine/<name>'
+
+service.ranking.name=Ranking
+service.ranking.description=If two enhancement engines with the same name are active the \
+one with the higher ranking will be used to process parsed content items.
+
+#===============================================================================
+#Properties and Options used to configure Tika Engine
+#===============================================================================
+
+org.apache.stanbol.enhancer.engines.tika.TikaEngine.name=Apache Stanbol \
+Enhancer Engine: Apache Tika
+org.apache.stanbol.enhancer.engines.tika.TikaEngine.description=Apache Tika \
+supports the conversion of parsed contentto XHTML and plain text. In addition \
+it allows also to extract additional metadata from various content formats. For \
+detailed information please see the Apache Tika project homepage.
\ No newline at end of file

Propchange: incubator/stanbol/trunk/enhancer/engines/tika/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/stanbol/trunk/enhancer/engines/topic/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/topic/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/topic/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/topic/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -30,7 +30,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/engines/zemanta/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/zemanta/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/zemanta/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/engines/zemanta/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -14,7 +14,7 @@
 #
 #
 #Wed Feb 15 19:07:21 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
 xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/generic/chainmanager/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/chainmanager/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/chainmanager/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/generic/chainmanager/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:01:50 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/generic/enginemanager/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/enginemanager/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/enginemanager/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/generic/enginemanager/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:01:52 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Thu Feb 16 11:07:03 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/jersey/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/jersey/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -21,7 +21,7 @@
 #
 #Wed Feb 15 19:02:09 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -12,6 +12,6 @@
 #
 #
 #Wed Feb 15 19:01:55 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -11,6 +11,6 @@
 #
 #
 #Wed Feb 15 19:01:54 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -23,7 +23,7 @@
 at.newmedialab.ldpath--ldpath-api--0.9.5-20120227.102725-7=The Apache Software License, Version 2.0
 at.newmedialab.ldpath--ldpath-core--0.9.5-20120227.102748-7=The Apache Software License, Version 2.0
 at.newmedialab.ldpath--ldpath-core-bundle--0.9.5-20120227.102752-7=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
 xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/generic/core/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -11,7 +11,7 @@
 #
 #
 #Wed Feb 15 19:03:10 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/generic/test/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/test/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/test/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/generic/test/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -10,6 +10,6 @@
 #
 #
 #Wed Feb 15 19:03:06 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -28,7 +28,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jdom--jdom--1.0=BSD License
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -28,7 +28,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jdom--jdom--1.0=BSD License
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -28,7 +28,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jdom--jdom--1.0=BSD License
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -30,7 +30,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 jdom--jdom--1.0=BSD License
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -26,7 +26,7 @@ asm--asm--3.1=BSD License
 at.newmedialab.ldpath--ldpath-api--0.9.5-SNAPSHOT=The Apache Software License, Version 2.0
 at.newmedialab.ldpath--ldpath-core--0.9.5-20120214.181820-5=The Apache Software License, Version 2.0
 at.newmedialab.ldpath--ldpath-core-bundle--0.9.5-20120214.181826-5=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.ant--ant--1.7.0=The Apache Software License, Version 2.0
 org.apache.ant--ant-launcher--1.7.0=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -30,7 +30,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/model/clerezza/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -13,7 +13,7 @@
 #
 #
 #Wed Feb 15 19:03:15 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -15,7 +15,7 @@
 #
 #
 #Tue Feb 21 13:32:38 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.2=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/yard/clerezza/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/clerezza/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/yard/clerezza/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -13,7 +13,7 @@
 #
 #
 #Wed Feb 15 19:03:42 CET 2012
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -24,7 +24,7 @@ commons-beanutils--commons-beanutils--1.
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
 javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/factstore/factstore/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -19,7 +19,7 @@
 #
 #Wed Feb 15 19:04:58 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/integration-tests/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/integration-tests/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -17,7 +17,7 @@
 #
 #Wed Feb 15 19:11:40 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:05:02 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/ontologymanager/registry/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/registry/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/ontologymanager/registry/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:05:11 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/ontologymanager/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -26,7 +26,7 @@
 #
 #Wed Feb 15 19:05:18 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/rules/base/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/base/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/base/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/rules/base/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:05:21 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/rules/manager/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/manager/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/rules/manager/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:05:24 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/rules/refactor/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/refactor/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/rules/refactor/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -18,7 +18,7 @@
 #
 #Wed Feb 15 19:05:34 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0

Modified: incubator/stanbol/trunk/rules/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/license/THIRD-PARTY.properties?rev=1294761&r1=1294760&r2=1294761&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/web/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/rules/web/src/license/THIRD-PARTY.properties Tue Feb 28 18:32:18 2012
@@ -21,7 +21,7 @@
 #
 #Wed Feb 15 19:05:40 CET 2012
 asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
 org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
 org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
 org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0