Author: rwesten
Date: Mon Feb 27 11:17:11 2012
New Revision: 1294112
URL: http://svn.apache.org/viewvc?rev=1294112&view=rev
Log:
Fixes STANBOL-508: Removes all references to the jdom bundle managed by the
springsource repository
NOTE that jdom was mainly referenced by ldpath-core. In the most current
SNAPSHOT version ldpath-core now includes jdom version 1.1.2 and exlcudes the
dependency to jaxen.
In addition the cnn crawler of the contenthub used htmlcleaner that also
depends on jdom. In this case the htmlcleaner dependency was moved to the
parnet poms and an exlusion of the jaxen dependency was defined.
This commit also updates the THIRD-PARTY license definition for the new
SNAPSHOT version of LDPath.
STANBOL-500:
* removed two unused classes
* enhancer/ldpath now passes the RAT profile
Added:
incubator/stanbol/trunk/enhancer/ldpath/README.md
- copied, changed from r1293628,
incubator/stanbol/trunk/enhancer/ldpath/README.txt
incubator/stanbol/trunk/enhancer/ldpath/src/license/
incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
(with props)
incubator/stanbol/trunk/enhancer/ldpath/src/test/resources/README
Removed:
incubator/stanbol/trunk/enhancer/ldpath/README.txt
Modified:
incubator/stanbol/trunk/commons/ldpath/clerezza/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/contenthub/crawler/cnn/pom.xml
incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/enhancer/ldpath/pom.xml
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/EnhancerLDPath.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/backend/ContentItemBackend.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/utils/Utils.java
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java
incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/parent/pom.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=1294112&r1=1294111&r2=1294112&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
Mon Feb 27 11:17:11 2012
@@ -1,29 +1,28 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache Software Licenses
-# - BSD
+# - Apache Software License
+# - Apache Software License, Version 2.0
# - BSD License
-# - BSD-style license
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - v 1.0
-# - GNU Lesser General Public License
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Feb 16 22:44:41 CET 2012
-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
-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.jdom--jdom--1.1=BSD License
+#Mon Feb 27 12:00:49 CET 2012
+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
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/crawler/cnn/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/crawler/cnn/pom.xml?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/crawler/cnn/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/crawler/cnn/pom.xml Mon Feb 27 11:17:11
2012
@@ -83,9 +83,6 @@
<dependency>
<groupId>net.sourceforge.htmlcleaner</groupId>
<artifactId>htmlcleaner</artifactId>
- <version>2.2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>jtidy</groupId>
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=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/trunk/contenthub/ldpath/src/license/THIRD-PARTY.properties
Mon Feb 27 11:17:11 2012
@@ -1,45 +1,38 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - Apache Software License, Version 1.1
-# - Apache Software Licenses
-# - BSD
+# - Apache Software License
+# - Apache Software License, Version 2.0
# - BSD License
# - BSD-style
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - v 1.0
-# - GNU Lesser General Public License
-# - GPL2 w/ CPE
+# - 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
-# - The Apache Software License, Version 2.0
-# - The GNU Lesser General Public License, Version 2.1
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Feb 21 13:20:13 CET 2012
+#Mon Feb 27 11:59:32 CET 2012
antlr--antlr--2.7.2=Public Domain
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
+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
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
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
-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
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
-org.jdom--jdom--1.1=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
oro--oro--2.0.8=The Apache Software License, Version 2.0
Copied: incubator/stanbol/trunk/enhancer/ldpath/README.md (from r1293628,
incubator/stanbol/trunk/enhancer/ldpath/README.txt)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/README.md?p2=incubator/stanbol/trunk/enhancer/ldpath/README.md&p1=incubator/stanbol/trunk/enhancer/ldpath/README.txt&r1=1293628&r2=1294112&rev=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/README.txt (original)
+++ incubator/stanbol/trunk/enhancer/ldpath/README.md Mon Feb 27 11:17:11 2012
@@ -1,3 +1,15 @@
+<!--
+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.
+-->
+
LD Path support for the Stanbol Enhancer
========================================
Modified: incubator/stanbol/trunk/enhancer/ldpath/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/pom.xml?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/ldpath/pom.xml Mon Feb 27 11:17:11 2012
@@ -74,7 +74,13 @@
<excludes>
<!-- AL20 License -->
<exclude>src/license/THIRD-PARTY.properties</exclude>
- </excludes>
+ <!-- AL20 License for test resources (see
src/test/resources/README) -->
+ <exclude>src/test/resources/content.html</exclude>
+ <exclude>src/test/resources/content.txt</exclude>
+ <exclude>src/test/resources/example.rdf.zip</exclude>
+ <exclude>src/test/resources/example.txt</exclude>
+ <exclude>src/test/resources/metadata.rdf.zip</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
@@ -142,6 +148,7 @@
<artifactId>rdf.jena.parser</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
Added:
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=1294112&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
(added)
+++ incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
Mon Feb 27 11:17:11 2012
@@ -0,0 +1,29 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - 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
+# - Similar to Apache License but with the acknowledgment clause removed
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Mon Feb 27 11:45:59 CET 2012
+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
+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
Propchange:
incubator/stanbol/trunk/enhancer/ldpath/src/license/THIRD-PARTY.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/EnhancerLDPath.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/EnhancerLDPath.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/EnhancerLDPath.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/EnhancerLDPath.java
Mon Feb 27 11:17:11 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.enhancer.ldpath;
import static
org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_RELATION;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/backend/ContentItemBackend.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/backend/ContentItemBackend.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/backend/ContentItemBackend.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/backend/ContentItemBackend.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.backend;
import static java.util.Collections.emptyMap;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.function;
import static at.newmedialab.ldpath.util.Collections.concat;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.function;
import java.util.Collection;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.function;
import java.util.Collection;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.function;
import static java.util.Collections.singletonMap;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/utils/Utils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/utils/Utils.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/utils/Utils.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/utils/Utils.java
Mon Feb 27 11:17:11 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.enhancer.ldpath.utils;
import static org.apache.stanbol.enhancer.ldpath.EnhancerLDPath.getConfig;
Modified:
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java
(original)
+++
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java
Mon Feb 27 11:17:11 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.enhancer.ldpath;
import static junit.framework.Assert.assertEquals;
Added: incubator/stanbol/trunk/enhancer/ldpath/src/test/resources/README
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/test/resources/README?rev=1294112&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/ldpath/src/test/resources/README (added)
+++ incubator/stanbol/trunk/enhancer/ldpath/src/test/resources/README Mon Feb
27 11:17:11 2012
@@ -0,0 +1,26 @@
+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.
+
+All files within this directory are provided under the
+
+ Apache License, Version 2.0
+
+This includes the following files:
+
+ content.html
+ content.txt
+ example.rdf.zip
+ example.txt
+ metadata.rdf.zip
\ No newline at end of file
Modified: incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml Mon
Feb 27 11:17:11 2012
@@ -59,11 +59,11 @@
<artifactId>org.apache.stanbol.entityhub.ldpath</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <bundle> <!-- LDPath requires jdom for xPath -->
+<!-- <bundle>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.1.0</version>
- </bundle>
+ </bundle> -->
</startLevel>
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=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties
(original)
+++ incubator/stanbol/trunk/entityhub/ldpath/src/license/THIRD-PARTY.properties
Mon Feb 27 11:17:11 2012
@@ -1,44 +1,38 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - Apache Software License, Version 1.1
-# - Apache Software Licenses
-# - BSD
+# - Apache Software License
+# - Apache Software License, Version 2.0
# - BSD License
# - BSD-style
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - v 1.0
-# - GNU Lesser General Public License
-# - GPL2 w/ CPE
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Feb 21 13:43:35 CET 2012
+#Mon Feb 27 11:40:53 CET 2012
antlr--antlr--2.7.2=Public Domain
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
+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
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
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
-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
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
-org.jdom--jdom--1.1=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
oro--oro--2.0.8=The Apache Software License, Version 2.0
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1294112&r1=1294111&r2=1294112&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Mon Feb 27 11:17:11 2012
@@ -1522,32 +1522,37 @@
<!-- END Solr/Lucene dependencies -->
<!-- JDom -->
- <!-- first the ready to use bundle -->
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
- </dependency>
- <!-- here are the jar -->
+ <!-- we do not need jaxen. using JDom only with xerxes is just fine -->
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jaxen-core</artifactId>
- <version>1.0-FCS</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jaxen-jdom</artifactId>
- <version>1.0-FCS</version>
+ <version>1.1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
+ <!-- HTML cleaner -->
+ <!-- we need to exclude jaxen and we do not need ant -->
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>saxpath</artifactId>
- <version>1.0-FCS</version>
+ <groupId>net.sourceforge.htmlcleaner</groupId>
+ <artifactId>htmlcleaner</artifactId>
+ <version>2.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OpenNLP -->
@@ -1946,13 +1951,6 @@
<url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/releases/</url>
</repository>
- <!-- JDom - see STANBOL-508 -->
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle
Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
-
</repositories>
</project>
