You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2012/03/15 16:45:04 UTC
svn commit: r1301055 - in /incubator/stanbol/trunk: ./
commons/ldpath/clerezza/src/license/ contenthub/ldpath/src/license/
contenthub/search/related/src/license/
contenthub/search/related/src/main/appended-resources/META-INF/
contenthub/web/ enhancer/l...
Author: fchrist
Date: Thu Mar 15 15:45:03 2012
New Revision: 1301055
URL: http://svn.apache.org/viewvc?rev=1301055&view=rev
Log:
STANBOL-270 Excluded unused OWLLINK dependency STANBOL-272 Fixed some headers; STANBOL-493 Fixed license information
Modified:
incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/contenthub/search/related/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/LICENSE
incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/NOTICE
incubator/stanbol/trunk/contenthub/web/pom.xml
incubator/stanbol/trunk/enhancer/ldpath/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/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
incubator/stanbol/trunk/reasoners/README.md
incubator/stanbol/trunk/reasoners/pom.xml
incubator/stanbol/trunk/releasing/stack/stanbol-stack-source-release-assembly-descriptor/src/main/resources/assemblies/stack.xml
Modified: incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties Thu Mar 15 15:45:03 2012
@@ -19,10 +19,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Tue Mar 06 16:37:04 CET 2012
-at.newmedialab.ldpath--ldpath-api--0.9.5-SNAPSHOT=
-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
+#Thu Mar 15 13:32:39 CET 2012
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/contenthub/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties Thu Mar 15 15:45:03 2012
@@ -20,12 +20,9 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 18:14:55 CET 2012
+#Thu Mar 15 14:02:09 CET 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
-at.newmedialab.ldpath--ldpath-api--0.9.5-SNAPSHOT=
-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
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=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=1301055&r1=1301054&r2=1301055&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 Thu Mar 15 15:45:03 2012
@@ -18,8 +18,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 18:14:22 CET 2012
-edu.smu.tspell--jaws--1.2=
+#Thu Mar 15 13:34:33 CET 2012
+edu.smu.tspell--jaws--1.2=JAWS License
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
Modified: incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/LICENSE?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/LICENSE Thu Mar 15 15:45:03 2012
@@ -1,4 +1,5 @@
+-----------------------------------------------------------------------------
JAWS 1.2 License
----------------
Modified: incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/NOTICE?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources/META-INF/NOTICE Thu Mar 15 15:45:03 2012
@@ -1,4 +1,3 @@
-
This bundle contains the JAWS 1.2 library from
http://lyle.smu.edu/~tspell/jaws/index.html
\ No newline at end of file
Modified: incubator/stanbol/trunk/contenthub/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/pom.xml?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/web/pom.xml Thu Mar 15 15:45:03 2012
@@ -63,6 +63,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
<!-- MIT License -->
<exclude>src/main/resources/org/apache/stanbol/contenthub/web/static/style/jquery-ui-1.8.11.custom.css</exclude>
<exclude>src/main/resources/org/apache/stanbol/contenthub/web/static/scripts/jquery-ui-1.8.11.custom.min.js</exclude>
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=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties Thu Mar 15 15:45:03 2012
@@ -19,10 +19,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 18:13:02 CET 2012
-at.newmedialab.ldpath--ldpath-api--0.9.5-SNAPSHOT=
-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
+#Thu Mar 15 13:33:42 CET 2012
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/entityhub/jersey/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/license/THIRD-PARTY.properties Thu Mar 15 15:45:03 2012
@@ -19,11 +19,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 18:15:14 CET 2012
+#Thu Mar 15 14:02:20 CET 2012
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-SNAPSHOT=
-at.newmedialab.ldpath--ldpath-core-bundle--0.9.5-SNAPSHOT=
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
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=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties (original)
+++ incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties Thu Mar 15 15:45:03 2012
@@ -20,12 +20,9 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 18:14:49 CET 2012
+#Thu Mar 15 14:02:00 CET 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
-at.newmedialab.ldpath--ldpath-api--0.9.5-SNAPSHOT=
-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
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
Modified: incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java (original)
+++ incubator/stanbol/trunk/factstore/factstore/src/test/java/org/apache/stanbol/factstore/HttpHeadersMock.java Thu Mar 15 15:45:03 2012
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.factstore;
import java.util.List;
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Thu Mar 15 15:45:03 2012
@@ -778,17 +778,10 @@
</dependency>
<!-- Wordnet -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.stanbol</groupId> -->
-<!-- <artifactId>edu.smu.tspell.jaws</artifactId> -->
-<!-- <version>1.2</version> -->
-<!-- </dependency> -->
<dependency>
<groupId>edu.smu.tspell</groupId>
<artifactId>jaws</artifactId>
<version>1.2</version>
- <!-- <type>jar</type>
- <scope>compile</scope> -->
</dependency>
<dependency>
Modified: incubator/stanbol/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Thu Mar 15 15:45:03 2012
@@ -75,7 +75,7 @@
<module>entityhub</module>
<module>factstore</module>
- <module>ontologymanager/ontonet</module>
+ <module>ontologymanager/ontonet</module>
<module>ontologymanager/registry</module>
<module>ontologymanager/web</module>
<module>ontologymanager/bundlelist</module>
@@ -156,6 +156,11 @@
<exclude>**/*.sem</exclude>
<exclude>**/test/**/*.eml</exclude>
<exclude>**/test/**/*.nt</exclude>
+ <exclude>**/test/**/*.html</exclude>
+ <exclude>**/test/**/*.xhtml</exclude>
+ <exclude>**/test/**/*.rdf</exclude>
+ <exclude>**/test/**/*.rtf</exclude>
+ <exclude>**/test/**/*.rules</exclude>
<!-- approved licenses, see modules' POMs for details -->
<exclude>**/src/license/THIRD-PARTY.properties</exclude>
@@ -167,6 +172,7 @@
<exclude>contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/static/scripts/jquery-1.4.2.js</exclude>
<exclude>factstore/factstore/src/main/resources/org/apache/stanbol/factstore/web/static/scripts/json2.js</exclude>
<exclude>ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/static/scripts/jquery-1.6.1</exclude>
+ <exclude>reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/static/jquery/jquery-1.6.1</exclude>
<exclude>rules/web/src/main/resources/org/apache/stanbol/rules/web/static/jquery/jquery-1.6.1</exclude>
<exclude>enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/static/openlayers-2.9/**</exclude>
<exclude>commons/owl/**</exclude>
@@ -174,6 +180,7 @@
<!-- unstable and not release relevant stuff -->
<exclude>PLAYGROUND.txt</exclude>
<exclude>conventions/**</exclude>
+ <exclude>contrib/**</exclude>
<exclude>enhancer/data/text-examples/**</exclude>
<exclude>enhancer/query-rendering/**</exclude>
<exclude>enhancer/stores/**</exclude>
@@ -183,9 +190,8 @@
<exclude>enhancer/engines/taxonomylinking/**</exclude>
<exclude>demos/**</exclude>
<exclude>launchers/kres/**</exclude>
- <!--
- <exclude>reasoners/**</exclude>
- -->
+ <exclude>reasoners/hermit/**</exclude>
+ <exclude>reasoners/owllink/**</exclude>
<exclude>reengineer/**</exclude>
<!-- exclude hidden files -->
Modified: incubator/stanbol/trunk/reasoners/README.md
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/README.md?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/README.md (original)
+++ incubator/stanbol/trunk/reasoners/README.md Thu Mar 15 15:45:03 2012
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
Apache Stanbol (Incubating)
Reasoners
Modified: incubator/stanbol/trunk/reasoners/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/pom.xml?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/pom.xml Thu Mar 15 15:45:03 2012
@@ -39,19 +39,21 @@
<module>jena</module>
<module>test</module>
<!-- module>hermit</module -->
- <module>owllink</module>
+ <!-- module>owllink</module -->
<module>web</module>
<module>bundlelist</module>
</modules>
+
<profiles>
- <profile>
- <id>do-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>services-tests</module>
- </modules>
- </profile>
-</profiles>
+ <profile>
+ <id>do-tests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>services-tests</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
Modified: incubator/stanbol/trunk/releasing/stack/stanbol-stack-source-release-assembly-descriptor/src/main/resources/assemblies/stack.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/releasing/stack/stanbol-stack-source-release-assembly-descriptor/src/main/resources/assemblies/stack.xml?rev=1301055&r1=1301054&r2=1301055&view=diff
==============================================================================
--- incubator/stanbol/trunk/releasing/stack/stanbol-stack-source-release-assembly-descriptor/src/main/resources/assemblies/stack.xml (original)
+++ incubator/stanbol/trunk/releasing/stack/stanbol-stack-source-release-assembly-descriptor/src/main/resources/assemblies/stack.xml Thu Mar 15 15:45:03 2012
@@ -32,10 +32,14 @@
<excludes>
<exclude>PLAYGROUND.txt</exclude>
+ <!-- license issues -->
+ <exclude>enhancer/engines/metaxa/**</exclude>
+ <exclude>reasoners/hermit/**</exclude>
+ <exclude>reasoners/owllink/**</exclude>
+
<!-- unstable/old stuff in enhancer -->
<exclude>enhancer/autotagging/**</exclude>
<exclude>enhancer/engines/autotagging/**</exclude>
- <exclude>enhancer/engines/metaxa/**</exclude>
<exclude>enhancer/dereferencing/**</exclude>
<exclude>enhancer/query-rendering/**</exclude>
<exclude>enhancer/SemiAutomaticContentEnhancer/**</exclude>