STANBOL 733: merged (nearly all) changes from the trunk to this branch. Only the moved bundlelists where not merged, because they where moved to a location that is not part of this branch.
git-svn-id: https://svn.apache.org/repos/asf/stanbol/branches/stanbol-nlp-processing@1413303 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/data/opennlp/lang/da/pom.xml b/data/opennlp/lang/da/pom.xml
index ae28f9b..f82ffb6 100644
--- a/data/opennlp/lang/da/pom.xml
+++ b/data/opennlp/lang/da/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.da</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Danish</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/de/pom.xml b/data/opennlp/lang/de/pom.xml
index 170e536..a0593a0 100644
--- a/data/opennlp/lang/de/pom.xml
+++ b/data/opennlp/lang/de/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.de</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for German</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/en/pom.xml b/data/opennlp/lang/en/pom.xml
index 56314c4..cda2ce6 100644
--- a/data/opennlp/lang/en/pom.xml
+++ b/data/opennlp/lang/en/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for English</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/es/pom.xml b/data/opennlp/lang/es/pom.xml
index 9d609e9..8884be7 100644
--- a/data/opennlp/lang/es/pom.xml
+++ b/data/opennlp/lang/es/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.es</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Spanish</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -88,8 +95,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -101,16 +108,16 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="sf.model.url" value="${opennlp.model.home}"/>
- <property name="git.model.url" value="${opennlp.git.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="sf.model.url" value="${opennlp.model.home}" />
+ <property name="git.model.url" value="${opennlp.git.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/nl/pom.xml b/data/opennlp/lang/nl/pom.xml
index 331a5cb..bb15983 100644
--- a/data/opennlp/lang/nl/pom.xml
+++ b/data/opennlp/lang/nl/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.nl</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Dutch</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/pt/pom.xml b/data/opennlp/lang/pt/pom.xml
index 70f5a1a..07a8211 100644
--- a/data/opennlp/lang/pt/pom.xml
+++ b/data/opennlp/lang/pt/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.pt</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Portuguese</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/lang/sv/pom.xml b/data/opennlp/lang/sv/pom.xml
index 1f4f72a..589f8a1 100644
--- a/data/opennlp/lang/sv/pom.xml
+++ b/data/opennlp/lang/sv/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.sv</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Swedish</name>
@@ -49,8 +48,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -89,8 +96,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -102,15 +109,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/ner/en/pom.xml b/data/opennlp/ner/en/pom.xml
index 025ea3c..8a55d46 100644
--- a/data/opennlp/ner/en/pom.xml
+++ b/data/opennlp/ner/en/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for English</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/ner/es/pom.xml b/data/opennlp/ner/es/pom.xml
index e5d6f4a..519a5ca 100644
--- a/data/opennlp/ner/es/pom.xml
+++ b/data/opennlp/ner/es/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.es</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Spanish</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/opennlp/ner/nl/pom.xml b/data/opennlp/ner/nl/pom.xml
index 10bb01b..0343862 100644
--- a/data/opennlp/ner/nl/pom.xml
+++ b/data/opennlp/ner/nl/pom.xml
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.nl</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Dutch</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
diff --git a/data/registries/default/pom.xml b/data/registries/default/pom.xml
index 1915b9f..24ae89e 100644
--- a/data/registries/default/pom.xml
+++ b/data/registries/default/pom.xml
@@ -15,21 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.registries.default</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Default ontology registries</name>
@@ -48,9 +47,6 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<build>
<plugins>
@@ -63,8 +59,8 @@
<configuration>
<instructions>
<!-- Header used to load the provided configurations -->
- <Data-Files>org/apache/stanbol/data/registries/default</Data-Files>
- <Data-Files-Priority>-100</Data-Files-Priority>
+ <Data-Files>org/apache/stanbol/data/registries/default</Data-Files>
+ <Data-Files-Priority>-100</Data-Files-Priority>
</instructions>
</configuration>
</plugin>
diff --git a/data/sites/dbpedia/pom.xml b/data/sites/dbpedia/pom.xml
index cb57842..e628aad 100644
--- a/data/sites/dbpedia/pom.xml
+++ b/data/sites/dbpedia/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: DBpedia.org</name>
@@ -108,8 +108,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -121,7 +121,7 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${dbpedia.default.index.path}" />
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${dbpedia.default.index.path}" />
<property name="index.url" value="${dbpedia.default.index.url}" />
<echo message="copy Solr Index " />
diff --git a/data/sites/dbpediacached/pom.xml b/data/sites/dbpediacached/pom.xml
index c63e0a8..52f95dc 100644
--- a/data/sites/dbpediacached/pom.xml
+++ b/data/sites/dbpediacached/pom.xml
@@ -15,21 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia.cached</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Remote DBpedia.org with local cache</name>
diff --git a/enhancer/benchmark/pom.xml b/enhancer/benchmark/pom.xml
index 923371a..bee5242 100644
--- a/enhancer/benchmark/pom.xml
+++ b/enhancer/benchmark/pom.xml
@@ -33,12 +33,12 @@
<name>Apache Stanbol Enhancer Benchmark</name>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/benchmark/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/benchmark/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/benchmark/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/benchmark/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
diff --git a/enhancer/benchmark/src/license/THIRD-PARTY.properties b/enhancer/benchmark/src/license/THIRD-PARTY.properties
index 56d0e09..66cd8a1 100644
--- a/enhancer/benchmark/src/license/THIRD-PARTY.properties
+++ b/enhancer/benchmark/src/license/THIRD-PARTY.properties
@@ -1,22 +1,29 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache Software License, Version 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - 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
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:15 CET 2012
+#Sun Oct 07 16:08:25 CEST 2012
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=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/chain/allactive/pom.xml b/enhancer/chain/allactive/pom.xml
index d71dbe8..db4813a 100644
--- a/enhancer/chain/allactive/pom.xml
+++ b/enhancer/chain/allactive/pom.xml
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/allactive/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/allactive/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/allactive/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/allactive/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,11 +57,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.allactive;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.allactive.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.allactive.impl
</Private-Package>
</instructions>
</configuration>
diff --git a/enhancer/chain/allactive/src/license/THIRD-PARTY.properties b/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
index dd3d2d7..ab103b1 100644
--- a/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
+++ b/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:00 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:07:53 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/chain/graph/pom.xml b/enhancer/chain/graph/pom.xml
index 0e08124..014faf0 100644
--- a/enhancer/chain/graph/pom.xml
+++ b/enhancer/chain/graph/pom.xml
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/graph/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/graph/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/graph/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/graph/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,11 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.graph;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.graph.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.graph.impl
</Private-Package>
</instructions>
</configuration>
diff --git a/enhancer/chain/graph/src/license/THIRD-PARTY.properties b/enhancer/chain/graph/src/license/THIRD-PARTY.properties
index da258ff..6cb3ff7 100644
--- a/enhancer/chain/graph/src/license/THIRD-PARTY.properties
+++ b/enhancer/chain/graph/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:02 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:07:56 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/chain/list/pom.xml b/enhancer/chain/list/pom.xml
index b4ca887..d11ca28 100644
--- a/enhancer/chain/list/pom.xml
+++ b/enhancer/chain/list/pom.xml
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chian/list
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chian/list
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/list
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/list
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,9 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.list.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.list.impl
</Private-Package>
</instructions>
</configuration>
diff --git a/enhancer/chain/list/src/license/THIRD-PARTY.properties b/enhancer/chain/list/src/license/THIRD-PARTY.properties
index c1292ec..3d39ec0 100644
--- a/enhancer/chain/list/src/license/THIRD-PARTY.properties
+++ b/enhancer/chain/list/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:06 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08:04 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/chain/weighted/pom.xml b/enhancer/chain/weighted/pom.xml
index 61a16d4..2f6576e 100644
--- a/enhancer/chain/weighted/pom.xml
+++ b/enhancer/chain/weighted/pom.xml
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chian/weighted
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chian/weighted
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/weighted
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/weighted
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,9 +59,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.weighted.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.weighted.impl
</Private-Package>
</instructions>
</configuration>
diff --git a/enhancer/chain/weighted/src/license/THIRD-PARTY.properties b/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
index 70141d0..a8d2dc7 100644
--- a/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
+++ b/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:04 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08:01 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/celi/pom.xml b/enhancer/engines/celi/pom.xml
index 0ea511f..89ba49a 100644
--- a/enhancer/engines/celi/pom.xml
+++ b/enhancer/engines/celi/pom.xml
@@ -25,10 +25,9 @@
<artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
<packaging>bundle</packaging>
- <name>Apache Stanbol Enhancer Enhancement Engine: CELI </name>
- <description></description>
- <inceptionYear>2012</inceptionYear>
-
+ <name>Apache Stanbol Enhancer Enhancement Engine : CELI Engine</name>
+ <description>Enhancement Engine using the CELI service.</description>
+ <inceptionYear>2012</inceptionYear>
<dependencies>
<dependency>
@@ -112,44 +111,44 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
-
</dependencies>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.stanbol.enhancer.engines.celi.ner.impl.*,
- org.apache.stanbol.enhancer.engines.celi.langid.impl.*,
- org.apache.stanbol.enhancer.engines.celi.classification.impl.*,
- org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl.*
- </Private-Package>
- <!-- <Embed-Dependency>true</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> -->
- <Import-Package>
- org.apache.http,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.stanbol.enhancer.engines.celi
+ </Export-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.celi.ner.impl,
+ org.apache.stanbol.enhancer.engines.celi.langid.impl,
+ org.apache.stanbol.enhancer.engines.celi.classification.impl,
+ org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl,
+ org.apache.stanbol.enhancer.engines.celi.utils
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/enhancer/engines/celi/src/license/THIRD-PARTY.properties b/enhancer/engines/celi/src/license/THIRD-PARTY.properties
index fc84410..7fc79e8 100644
--- a/enhancer/engines/celi/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/celi/src/license/THIRD-PARTY.properties
@@ -18,8 +18,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Jun 04 06:56:13 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:27:20 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java b/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
index 289b893..779a5e4 100644
--- a/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
+++ b/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.net.UnknownHostException;
+import java.rmi.RemoteException;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
@@ -43,6 +44,7 @@
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -105,12 +107,9 @@
int numTopicAnnotations = validateAllTopicAnnotations(ci.getMetadata() , expectedValues);
assertTrue("No TpocisAnnotations found", numTopicAnnotations > 0);
} catch (EngineException e) {
- if (e.getCause() != null && e.getCause() instanceof UnknownHostException) {
- log.warn("Celi Service not reachable -> offline? -> deactivate test");
- return;
- }
- throw e;
- }
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
}
}
diff --git a/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java b/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
index 8ef1090..62c6369 100644
--- a/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
+++ b/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
@@ -115,7 +115,7 @@
morphoAnalysisEngine.computeEnhancements(ci);
} catch (EngineException e) {
RemoteServiceHelper.checkServiceUnavailable(e);
- return; //Deactivate this test
+ return;
}
TestUtils.logEnhancements(ci);
@@ -151,6 +151,7 @@
morphoAnalysisEngine.computeEnhancements(ci);
} catch (EngineException e) {
RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
}
TestUtils.logEnhancements(ci);
diff --git a/enhancer/engines/dbpedia-spotlight/pom.xml b/enhancer/engines/dbpedia-spotlight/pom.xml
index b9a783f..8eb7226 100644
--- a/enhancer/engines/dbpedia-spotlight/pom.xml
+++ b/enhancer/engines/dbpedia-spotlight/pom.xml
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,11 +59,22 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.dbpspotlight.annotate;version=${project.version}
+ org.apache.stanbol.enhancer.engines.dbpspotlight;version=${project.version}
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.dbpspotlight.annotate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.candidates,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.disambiguate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.model,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.spot,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.utils
+ </Private-Package>
<!-- configure a dbpedia chain -->
<Install-Path>config</Install-Path>
</instructions>
@@ -104,11 +115,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
index 8d30977..a4f277a 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
@@ -27,13 +27,19 @@
String PARAM_SUPPORT = "dbpedia.spotlight.support";
String PARAM_CONFIDENCE = "dbpedia.spotlight.confidence";
-
+ /**
+ * Cab be used to set both connection AND read timeout for Http requests
+ * to the configured DBpedia Spotlight services.<br>
+ * Supported by all DBpedia Spotlight Engines.
+ */
+ String PARAM_CONNECTION_TIMEOUT = "dbpedia.spotlight.connection.timeout";
/**
* The namespace used by DBpedia Spotlight specific properties
*/
String SPOTLIGHT_NAME_SPACE = "http://spotlight.dbpedia.org/ns/";
+
/*
* Definition of some Spotlight specific properties added to
* fise:EntityAnnotations created by this Engine
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
index 7e76ff9..ad6f14e 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
@@ -24,6 +24,7 @@
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_SUPPORT;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_URL_KEY;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.UTF8;
+import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.SpotlightEngineUtils.getConnectionTimeout;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.XMLParser.loadXMLFromInputStream;
import java.io.BufferedWriter;
@@ -120,6 +121,8 @@
/** holds the sparql restriction for the results, if the user wishes one */
private String spotlightSparql;
+ private int connectionTimeout;
+
/**
* Default constructor used by OSGI. Expects {@link #activate(ComponentContext)}
* to be called before the instance is used.
@@ -130,8 +133,9 @@
* Constructor intended to be used by unit tests
* @param spotlightUrl
*/
- protected DBPSpotlightAnnotateEnhancementEngine(URL spotlightUrl){
+ protected DBPSpotlightAnnotateEnhancementEngine(URL spotlightUrl, int connectionTimeout){
this.spotlightUrl = spotlightUrl;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -149,6 +153,7 @@
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = getConnectionTimeout(properties);
spotlightSpotter = properties.get(PARAM_SPOTTER) == null ? null
: (String) properties.get(PARAM_SPOTTER);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
@@ -267,6 +272,12 @@
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
index 2cfd1b6..9b1427e 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
@@ -24,6 +24,7 @@
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_SUPPORT;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_URL_KEY;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.UTF8;
+import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.SpotlightEngineUtils.getConnectionTimeout;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.XMLParser.loadXMLFromInputStream;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_RELATION;
@@ -125,6 +126,8 @@
/** holds the sparql restriction for the results, if the user wishes one */
private String spotlightSparql;
+ private int connectionTimeout;
+
/**
* Used by OSGI to instantiate the engine. Expects
* {@link #activate(ComponentContext)} to be called before usage
@@ -135,8 +138,9 @@
* Used by unit tests
* @param spotlightUrl
*/
- protected DBPSpotlightCandidatesEnhancementEngine(URL spotlightUrl){
+ protected DBPSpotlightCandidatesEnhancementEngine(URL spotlightUrl,int connectionTimeout){
this.spotlightUrl = spotlightUrl;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -156,6 +160,7 @@
Dictionary<String, Object> properties = ce.getProperties();
//parse the URL of the RESTful service
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
spotlightSpotter = properties.get(PARAM_SPOTTER) == null ? null
: (String) properties.get(PARAM_SPOTTER);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
@@ -275,7 +280,13 @@
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
index abc4ff1..282853e 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
@@ -138,6 +138,8 @@
* Spotlight, and later for linking of the results
*/
private Hashtable<String, UriRef> textAnnotationsMap;
+
+ private int connectionTimeout;
/**
* Default constructor used by OSGI. It is expected that
* {@link #activate(ComponentContext)} is called before
@@ -149,8 +151,9 @@
* Constructor intended to be used for unit tests
* @param serviceURL
*/
- protected DBPSpotlightDisambiguateEnhancementEngine(URL serviceURL){
+ protected DBPSpotlightDisambiguateEnhancementEngine(URL serviceURL,int connectionTimeout){
this.spotlightUrl = serviceURL;
+ this.connectionTimeout = connectionTimeout;
}
/**
* Initialize all parameters from the configuration panel, or with their
@@ -167,6 +170,7 @@
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
: (String) properties.get(PARAM_DISAMBIGUATOR);
spotlightTypesRestriction = properties.get(PARAM_RESTRICTION) == null ? null
@@ -296,7 +300,13 @@
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
index d2dc2be..38e1d53 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
@@ -106,14 +106,17 @@
/** holds the chosen of spotter to be used */
private String spotlightSpotter;
+ private int connectionTimeout;
+
/**
* Default constructor used by OSGI
*/
public DBPSpotlightSpotEnhancementEngine(){}
- protected DBPSpotlightSpotEnhancementEngine(URL spotlightUrl, String spotlightSpotter){
+ protected DBPSpotlightSpotEnhancementEngine(URL spotlightUrl, String spotlightSpotter, int connectionTimeout){
this.spotlightUrl = spotlightUrl;
this.spotlightSpotter = spotlightSpotter;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -131,6 +134,7 @@
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
//also set the spotter to null if an empty string is parsed
Object spotterConfig = properties.get(PARAM_SPOTTER);
@@ -238,7 +242,13 @@
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
diff --git a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
index 4e8135f..24b364b 100644
--- a/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
+++ b/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
@@ -22,8 +22,10 @@
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_START;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.NumberFormat;
import java.util.Dictionary;
import java.util.Map.Entry;
@@ -281,5 +283,21 @@
model.add(new TripleImpl(entityAnnotation, PROPERTY_SIMILARITY_SCORE, literalFactory
.createTypedLiteral(annotation.similarityScore)));
}
+
+ public static int getConnectionTimeout(Dictionary<String,Object> engineConfig) throws ConfigurationException {
+ Object value = engineConfig.get(Constants.PARAM_CONNECTION_TIMEOUT);
+ if(value instanceof Number){
+ return ((Number) value).intValue();
+ } else if(value != null){
+ try {
+ return Integer.parseInt(value.toString());
+ } catch (NumberFormatException e) {
+ throw new ConfigurationException(Constants.PARAM_CONNECTION_TIMEOUT,
+ "Parsed value MUST be a valid Integer (Seconds)");
+ }
+ } else {
+ return -1;
+ }
+ }
}
diff --git a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
index 4de6698..a177bdc 100644
--- a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
+++ b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
@@ -79,7 +79,7 @@
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new URL(SPL_URL),10);
}
@Before
public void initTest() throws IOException {
diff --git a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
index 6489e0f..04a37c7 100644
--- a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
+++ b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
@@ -79,7 +79,7 @@
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new URL(SPL_URL),10);
}
@Before
diff --git a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
index 3889b6e..0fadc5d 100644
--- a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
+++ b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
@@ -86,7 +86,7 @@
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new URL(SPL_URL),10);
}
@Before
diff --git a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
index 467b355..b22fe8a 100644
--- a/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
+++ b/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
@@ -80,7 +80,7 @@
@BeforeClass
public static void oneTimeSetup() throws Exception {
//and the enhancement engine instance
- dbpslight = new DBPSpotlightSpotEnhancementEngine(new URL(SPL_URL),null);
+ dbpslight = new DBPSpotlightSpotEnhancementEngine(new URL(SPL_URL),null,10);
}
@Before
diff --git a/enhancer/engines/entitytagging/pom.xml b/enhancer/engines/entitytagging/pom.xml
index 48c8e60..ef62e95 100644
--- a/enhancer/engines/entitytagging/pom.xml
+++ b/enhancer/engines/entitytagging/pom.xml
@@ -44,12 +44,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/entitytagging/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/entitytagging/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/entitytagging/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/entitytagging/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -60,15 +60,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.entitytagging;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.engines.entitytagging.impl.*
+ org.apache.stanbol.enhancer.engines.entitytagging.impl
</Private-Package>
- <!-- TODO those should be bundles! -->
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -153,7 +152,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties b/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
index 28b10d6..0c5f3c7 100644
--- a/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
@@ -1,18 +1,34 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:07:05 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:15:19 CEST 2012
+antlr--antlr--2.7.2=Public Domain
+asm--asm--3.1=BSD License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.1=BSD style license
+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.5=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
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
+xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
diff --git a/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java b/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
index 37262cf..63b8ac8 100644
--- a/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
+++ b/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
@@ -84,11 +84,9 @@
*
* @author ogrisel, rwesten
*/
-@Component(configurationFactory = true, policy = ConfigurationPolicy.REQUIRE, // the
-// baseUri
-// is
-// required!
-specVersion = "1.1", metatype = true, immediate = true, inherit = true)
+@Component(configurationFactory = true,
+ policy = ConfigurationPolicy.REQUIRE, // the baseUri is required!
+ specVersion = "1.1", metatype = true, immediate = true, inherit = true)
@Service
@org.apache.felix.scr.annotations.Properties(value = {@Property(name = EnhancementEngine.PROPERTY_NAME)})
public class NamedEntityTaggingEngine extends AbstractEnhancementEngine<RuntimeException,RuntimeException>
@@ -96,29 +94,25 @@
private final Logger log = LoggerFactory.getLogger(getClass());
- @Property
- // (value = "dbpedia")
+ @Property // (value = "dbpedia")
public static final String REFERENCED_SITE_ID = "org.apache.stanbol.enhancer.engines.entitytagging.referencedSiteId";
@Property(boolValue = false)
public static final String PERSON_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.personState";
- @Property
- // (value = "dbp-ont:Person")
+ @Property // (value = "dbp-ont:Person")
public static final String PERSON_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.personType";
@Property(boolValue = false)
public static final String ORG_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.organisationState";
- @Property
- // (value = "dbp-ont:Organisation")
+ @Property // (value = "dbp-ont:Organisation")
public static final String ORG_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.organisationType";
@Property(boolValue = false)
public static final String PLACE_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.placeState";
- @Property
- // (value = "dbp-ont:Place")
+ @Property // (value = "dbp-ont:Place")
public static final String PLACE_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.placeType";
/**
* Use the RDFS label as default
diff --git a/enhancer/engines/langdetect/pom.xml b/enhancer/engines/langdetect/pom.xml
index a90ff4e..a979ec5 100644
--- a/enhancer/engines/langdetect/pom.xml
+++ b/enhancer/engines/langdetect/pom.xml
@@ -32,7 +32,7 @@
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Enhancer Enhancement Engine : Language Identifier</name>
+ <name>Apache Stanbol Enhancer Enhancement Engine : Language Detection</name>
<description>language detection for 53 languages based on http://code.google.com/p/language-detection
</description>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langdetect/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langdetect/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langdetect/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langdetect/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -56,9 +56,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.enhancer.engines.langdetect;version=${project.version}
- </Export-Package>
+ </Private-Package>
<Embed-Dependency>
langdetect;scope=compile,jsonic;scope=compile
</Embed-Dependency>
@@ -67,7 +67,9 @@
!com.google.inject.*,
!org.seasar.framework.*,
!org.springframework.*,
- *
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
</Import-Package>
</instructions>
</configuration>
@@ -83,6 +85,8 @@
<excludes>
<!-- AL20 licensed files: See src/test/resources/README -->
<exclude>src/test/resources/*.txt</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/enhancer/engines/langid/pom.xml b/enhancer/engines/langid/pom.xml
index 82af064..b792e4b 100644
--- a/enhancer/engines/langid/pom.xml
+++ b/enhancer/engines/langid/pom.xml
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langid/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langid/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langid/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langid/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,11 +58,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
org.apache.stanbol.enhancer.engines.langid;version=${project.version}
- </Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -77,6 +80,8 @@
<excludes>
<!-- AL20 licensed files: See src/test/resources/README -->
<exclude>src/test/resources/en.txt</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/enhancer/engines/langid/src/license/THIRD-PARTY.properties b/enhancer/engines/langid/src/license/THIRD-PARTY.properties
index 1dc0a17..e94f2f4 100644
--- a/enhancer/engines/langid/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/langid/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:06:13 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:37:15 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/metaxa/pom.xml b/enhancer/engines/metaxa/pom.xml
index 8b8e21d..125402e 100644
--- a/enhancer/engines/metaxa/pom.xml
+++ b/enhancer/engines/metaxa/pom.xml
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/metaxa/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/metaxa/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/metaxa/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/metaxa/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -110,8 +110,13 @@
!schemasMicrosoftComOfficeWord,
org.w3c.dom,
javax.xml.namespace,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.metaxa.*
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -129,6 +134,8 @@
<exclude>src/test/resources/html-res.txt</exclude>
<exclude>src/test/resources/pdf-res.txt</exclude>
<exclude>src/test/resources/mail-multipart-test.eml</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties b/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
index fa6b679..3c203f5 100644
--- a/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
@@ -2,29 +2,34 @@
#-------------------------------------------------------------------------------
# Already used licenses in project :
# - Aduna BSD license
-# - Apache License
+# - Apache Software License
+# - Apache Software License, Version 2.0
# - BSD License
-# - BSD license
-# - BSD-style license
+# - BSD style license
# - Bouncy Castle Licence
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - CDDL v1.1
+# - 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
-# - MIT license
-# - The Apache Software License, Version 2.0
-# - The BSD License
+# - Mozilla Public License 1.1
+# - Public Domain License
# - iCal4j - License
# - mstor License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:06:46 CET 2012
+#Sun Oct 07 16:45:31 CEST 2012
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=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/opencalais/pom.xml b/enhancer/engines/opencalais/pom.xml
index b277b32..c814ab6 100644
--- a/enhancer/engines/opencalais/pom.xml
+++ b/enhancer/engines/opencalais/pom.xml
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opencalais/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opencalais/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opencalais/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opencalais/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -55,9 +55,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.opencalais;version=${project.version},
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.opencalais.impl
+ </Private-Package>
</instructions>
</configuration>
</plugin>
diff --git a/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties b/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
index 8a14ba9..edbbe6b 100644
--- a/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
@@ -1,21 +1,25 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - BSD
-# - BSD-style license
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:07:17 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:27:28 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/pom.xml b/enhancer/engines/pom.xml
index 44b5008..f377533 100644
--- a/enhancer/engines/pom.xml
+++ b/enhancer/engines/pom.xml
@@ -33,12 +33,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
@@ -47,6 +47,8 @@
<module>langid</module>
<module>topic</module>
<module>metaxa</module>
+ <!-- not in this branch
+ module>htmlextractor</module -->
<module>tika</module>
<module>entitytagging</module>
<!-- No longer in this branch. was moved to entityhublinking
diff --git a/enhancer/engines/refactor/pom.xml b/enhancer/engines/refactor/pom.xml
index cf25314..62eda4d 100644
--- a/enhancer/engines/refactor/pom.xml
+++ b/enhancer/engines/refactor/pom.xml
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/geonames/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/geonames/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/geonames/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/geonames/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,11 +57,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.refactor
+ </Private-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.refactor;version=${project.version}
+ org.apache.stanbol.enhancer.engines.refactor.dereferencer
</Export-Package>
<Import-Package>
!javax.xml.stream.*,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ org.apache.stanbol.ontologymanager.sources.clerezza; provide:=true,
*
</Import-Package>
<!-- TODO those should be bundles! -->
@@ -72,6 +78,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- AL20 License, see src/main/resources/README -->
+ <exclude>src/main/resources/META-INF/default/seo_rules.sem</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -96,6 +115,7 @@
</dependency>
<!-- KReS dependencies -->
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
@@ -119,6 +139,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
@@ -127,6 +148,21 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
@@ -134,7 +170,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/enhancer/engines/refactor/src/license/THIRD-PARTY.properties b/enhancer/engines/refactor/src/license/THIRD-PARTY.properties
index 67b8cc2..ff440d7 100644
--- a/enhancer/engines/refactor/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/refactor/src/license/THIRD-PARTY.properties
@@ -1,6 +1,7 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License Version 2.0, January 2004
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
@@ -18,11 +19,10 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 17:34:54 CET 2012
+#Sun Oct 07 18:21:39 CEST 2012
asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=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
-owlapi--owlapi--3.2.3=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
diff --git a/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java b/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
index d1c5cfc..c6e41ce 100644
--- a/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
+++ b/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
@@ -58,20 +58,20 @@
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.apache.stanbol.entityhub.servicesapi.site.SiteManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionLimitException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologySource;
import org.apache.stanbol.rules.base.api.AlreadyExistingRecipeException;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -160,7 +160,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- ONManager onManager;
+ ScopeManager onManager;
@Reference
OntologyProvider<TcProvider> ontologyProvider;
@@ -176,7 +176,7 @@
@Reference
RuleStore ruleStore;
- private OntologyScope scope;
+ private Scope scope;
@Reference
SessionManager sessionManager;
@@ -480,7 +480,7 @@
}
try {
// TODO replace with a Clerezza equivalent
- ontologySpace.addOntology(new RootOntologyIRISource(physicalIRI, sharedManager));
+ ontologySpace.addOntology(new RootOntologySource(physicalIRI, sharedManager));
success.add(url);
} catch (OWLOntologyCreationException e) {
log.error("Failed to load ontology from physical location " + physicalIRI
@@ -496,7 +496,7 @@
for (String s : failed)
log.info(" >> {} : FAILED", s);
ontologySpace.setUp();
- if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
+ // if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
onManager.setScopeActive(scopeId, true);
/*
diff --git a/enhancer/engines/refactor/src/main/resources/README b/enhancer/engines/refactor/src/main/resources/README
new file mode 100644
index 0000000..8230694
--- /dev/null
+++ b/enhancer/engines/refactor/src/main/resources/README
@@ -0,0 +1,22 @@
+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 listed files are provided under the
+
+ Apache License, Version 2.0
+
+This includes the following files:
+
+ META-INF/default/seo_rules.sem
\ No newline at end of file
diff --git a/enhancer/engines/tika/pom.xml b/enhancer/engines/tika/pom.xml
index 4a64c91..05cfb75 100644
--- a/enhancer/engines/tika/pom.xml
+++ b/enhancer/engines/tika/pom.xml
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/tika/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/tika/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/tika/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/tika/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,9 +57,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.tika;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.tika.*
+ </Private-Package>
<!-- Workaround for COMPRESS-199 -->
<Embed-Dependency>
commons-compress,
diff --git a/enhancer/engines/tika/src/license/THIRD-PARTY.properties b/enhancer/engines/tika/src/license/THIRD-PARTY.properties
index 5b531fd..5c59dd8 100644
--- a/enhancer/engines/tika/src/license/THIRD-PARTY.properties
+++ b/enhancer/engines/tika/src/license/THIRD-PARTY.properties
@@ -5,6 +5,7 @@
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
+# - BSD style license
# - Bouncy Castle Licence
# - Common Development And Distribution License (CDDL), Version 1.0
# - Common Development And Distribution License (CDDL), Version 1.1
@@ -15,15 +16,16 @@
# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
+# - Mozilla Public License 1.1 (MPL 1.1)
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Feb 28 09:40:11 CET 2012
+#Sun Oct 07 18:15:10 CEST 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
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/engines/zemanta/pom.xml b/enhancer/engines/zemanta/pom.xml
index 365696e..ad82751 100644
--- a/enhancer/engines/zemanta/pom.xml
+++ b/enhancer/engines/zemanta/pom.xml
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/zemanta/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/zemanta/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/zemanta/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/zemanta/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -62,9 +62,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.engines.zemanta.impl.*
</Private-Package>
+ <Export-Package>
+ org.apache.stanbol.enhancer.engines.zemanta
+ </Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/enhancer/generic/rdfentities/pom.xml b/enhancer/generic/rdfentities/pom.xml
index ed18b70..0bb8089 100644
--- a/enhancer/generic/rdfentities/pom.xml
+++ b/enhancer/generic/rdfentities/pom.xml
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/rdfentities/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/rdfentities/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/rdfentities/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/rdfentities/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -56,12 +56,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.enhancer.rdfentities;version=${project.version},
- org.apache.stanbol.enhancer.rdfentities.fise;version=${project.version}
+ org.apache.stanbol.enhancer.rdfentities.*;version=${project.version}
</Export-Package>
- <Private-Package>
- org.apache.stanbol.enhancer.rdfentities.impl;version=${project.version}
- </Private-Package>
</instructions>
</configuration>
</plugin>
diff --git a/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties b/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties
index 629e4c4..a93bc2a 100644
--- a/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties
+++ b/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties
@@ -18,7 +18,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Apr 09 10:45:52 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:03:57 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.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
diff --git a/enhancer/jersey/pom.xml b/enhancer/jersey/pom.xml
index 4270f48..a04595e 100644
--- a/enhancer/jersey/pom.xml
+++ b/enhancer/jersey/pom.xml
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jersey/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jersey/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -60,11 +60,13 @@
<Export-Package>
org.apache.stanbol.enhancer.jersey.*
</Export-Package>
- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
+ <Embed-Dependency>
+ *;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
@@ -101,7 +103,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -125,6 +127,10 @@
<!-- Jersey -->
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ </dependency>
+<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
diff --git a/enhancer/jersey/src/license/THIRD-PARTY.properties b/enhancer/jersey/src/license/THIRD-PARTY.properties
index ec1f053..72c4d01 100644
--- a/enhancer/jersey/src/license/THIRD-PARTY.properties
+++ b/enhancer/jersey/src/license/THIRD-PARTY.properties
@@ -1,27 +1,26 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache License Version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - CDDL License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - Version 1.0
-# - GPL2 w/ CPE
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:09 CET 2012
+#Sun Oct 07 16:08:09 CEST 2012
asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
index 49d551b..b1987ff 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
@@ -60,7 +60,6 @@
private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/enhancer/jersey/static";
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/enhancer/jersey/templates";
private BundleContext bundleContext;
@@ -111,10 +110,6 @@
return STATIC_RESOURCE_PATH;
}
- @Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
@Override
public List<LinkResource> getLinkResources() {
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
index d331e9e..422435d 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
@@ -54,7 +54,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Abstract super class for all Enhancer endpoint that do also provide the
@@ -93,7 +93,7 @@
@GET
@Produces(TEXT_HTML)
public Response get(@Context HttpHeaders headers) {
- ResponseBuilder res = Response.ok(new Viewable("index", this), TEXT_HTML);
+ ResponseBuilder res = Response.ok(new Viewable("index", this, AbstractEnhancerUiResource.class), TEXT_HTML);
addCORSOrigin(servletContext, res, headers);
return res.build();
}
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
index 432924a..51c9739 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
@@ -55,7 +55,7 @@
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/chain")
public class ChainsRootResource extends BaseStanbolResource {
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
index 6f72557..4ec9c00 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
@@ -96,7 +96,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
public class ContentItemResource extends BaseStanbolResource {
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
index 66ae671..0af2135 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
@@ -43,7 +43,7 @@
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/engine/{engineName}")
public class EnhancementEngineResource extends AbstractEnhancerResource {
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
index 1527d3b..be86ca3 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
@@ -55,7 +55,7 @@
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/engine")
public class EnhancementEnginesRootResource extends BaseStanbolResource {
diff --git a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
index e5d0e83..231307b 100644
--- a/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
+++ b/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
@@ -56,7 +56,7 @@
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.enhancer.servicesapi.rdf.Enhancer;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/ajax/contentitem.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/contentitem.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/ajax/contentitem.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/contentitem.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl b/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
rename to enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl b/enhancer/jersey/src/main/resources/templates/imports/contentitem.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/contentitem.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/enhancerbase.ftl b/enhancer/jersey/src/main/resources/templates/imports/doc/enhancerbase.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/enhancerbase.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/doc/enhancerbase.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/executionplan.ftl b/enhancer/jersey/src/main/resources/templates/imports/doc/executionplan.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/executionplan.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/doc/executionplan.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/multipartcontentitem.ftl b/enhancer/jersey/src/main/resources/templates/imports/doc/multipartcontentitem.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/multipartcontentitem.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/doc/multipartcontentitem.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enginesDescription.ftl b/enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enginesDescription.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancersparql.ftl b/enhancer/jersey/src/main/resources/templates/imports/enhancersparql.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancersparql.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/enhancersparql.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancerweb.ftl b/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancerweb.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/entities.ftl b/enhancer/jersey/src/main/resources/templates/imports/entities.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/entities.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/entities.ftl
diff --git a/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/executionmetadata.ftl b/enhancer/jersey/src/main/resources/templates/imports/executionmetadata.ftl
similarity index 100%
rename from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/executionmetadata.ftl
rename to enhancer/jersey/src/main/resources/templates/imports/executionmetadata.ftl
diff --git a/enhancer/jobmanager/event/pom.xml b/enhancer/jobmanager/event/pom.xml
index 3a96a71..ed844b8 100644
--- a/enhancer/jobmanager/event/pom.xml
+++ b/enhancer/jobmanager/event/pom.xml
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/event/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/event/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/event/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/event/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,6 +59,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.jobmanager.event;version=${project.version}
</Export-Package>
diff --git a/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties b/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
index 8a2b281..db47af4 100644
--- a/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
+++ b/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:01:55 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:06:06 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java b/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
index 7f4bde0..0aa3549 100644
--- a/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
+++ b/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
@@ -25,13 +25,11 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -40,13 +38,14 @@
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
-import org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.ibm.icu.lang.UCharacter.SentenceBreak;
+
public class EnhancementJobHandler implements EventHandler {
private EnhancementEngineManager engineManager;
@@ -69,7 +68,7 @@
* contentItems and the values are the objects used to interrupt the
* requesting thread as soon as the enhancement process has finished.
*/
- private Map<EnhancementJob,Object> processingJobs;
+ private Map<EnhancementJob,EnhancementJobObserver> processingJobs;
private final ReadWriteLock processingLock = new ReentrantReadWriteLock();
private Thread observerDaemon;
@@ -85,11 +84,11 @@
this.engineManager = engineManager;
processingLock.writeLock().lock();
try {
- processingJobs = new LinkedHashMap<EnhancementJob,Object>();
+ processingJobs = new LinkedHashMap<EnhancementJob,EnhancementJobObserver>();
} finally{
processingLock.writeLock().unlock();
}
- observerDaemon = new Thread(new EnhancementJobObserver());
+ observerDaemon = new Thread(new EnhancementJobObserverDaemon());
observerDaemon.setName("Event Job Manager Observer Daemon");
observerDaemon.setDaemon(true);
observerDaemon.start();
@@ -134,19 +133,19 @@
* @return An object that will get {@link Object#notifyAll()} as soon as
* {@link EnhancementJob#isFinished()} or this instance is deactivated
*/
- public Object register(EnhancementJob enhancementJob){
+ public EnhancementJobObserver register(EnhancementJob enhancementJob){
final boolean init;
- Object o;
+ EnhancementJobObserver observer;
processingLock.writeLock().lock();
try {
if(enhancementJob == null || processingJobs == null){
return null;
}
- o = processingJobs.get(enhancementJob);
- if(o == null){
- o = new Object();
- logJobInfo(enhancementJob, "Add EnhancementJob:");
- processingJobs.put(enhancementJob, o);
+ observer = processingJobs.get(enhancementJob);
+ if(observer == null){
+ observer = new EnhancementJobObserver(enhancementJob);
+ logJobInfo(log, enhancementJob, "Add EnhancementJob:",false);
+ processingJobs.put(enhancementJob, observer);
init = true;
} else {
init = false;
@@ -155,6 +154,7 @@
processingLock.writeLock().unlock();
}
if(init){
+ observer.acquire();
enhancementJob.startProcessing();
log.debug("++ w: {}","init execution");
enhancementJob.getLock().writeLock().lock();
@@ -166,7 +166,7 @@
enhancementJob.getLock().writeLock().unlock();
}
}
- return o;
+ return observer;
}
@Override
@@ -283,18 +283,21 @@
*/
private void finish(EnhancementJob job){
processingLock.writeLock().lock();
- Object o;
+ EnhancementJobObserver observer;
try {
- o = processingJobs.remove(job);
+ observer = processingJobs.remove(job);
} finally {
processingLock.writeLock().unlock();
}
- if(o != null) {
- synchronized (o) {
- logJobInfo(job, "Finished EnhancementJob:");
+ if(observer != null) {
+ try {
+ logJobInfo(log, job, "Finished EnhancementJob:",false);
log.debug("++ n: finished processing ContentItem {} with Chain {}",
job.getContentItem().getUri(),job.getChainName());
- o.notifyAll();
+ } finally {
+ //release the semaphore to send signal to the EventJobManager waiting
+ //for the results
+ observer.release();
}
} else {
log.warn("EnhancementJob for ContentItem {} is not " +
@@ -335,15 +338,16 @@
* Logs basic infos about the Job as INFO and detailed infos as DEBUG
* @param job
*/
- protected void logJobInfo(EnhancementJob job, String header) {
+ protected static void logJobInfo(Logger log, EnhancementJob job, String header, boolean logExecutions) {
if(header != null){
log.info(header);
}
- log.info(" state: {}",job.isFinished()?"finished":job.isFailed()?"failed":"processing");
- log.info(" chain: {}",job.getChainName());
+ log.info(" finished: {}",job.isFinished());
+ log.info(" state: {}",job.isFailed()?"failed":"processing");
+ log.info(" chain: {}",job.getChainName());
log.info(" content-item: {}", job.getContentItem().getUri());
- log.debug(" executions:");
- if(log.isDebugEnabled()){
+ if(logExecutions){
+ log.info(" executions:");
for(NonLiteral completedExec : job.getCompleted()){
log.info(" - {} completed",getEngine(job.getExecutionMetadata(),
job.getExecutionNode(completedExec)));
@@ -354,16 +358,87 @@
}
}
}
+ public class EnhancementJobObserver{
+
+ private static final int MIN_WAIT_TIME = 500;
+ private final EnhancementJob enhancementJob;
+ private final Semaphore semaphore;
+
+ private EnhancementJobObserver(EnhancementJob job){
+ if(job == null){
+ throw new IllegalArgumentException("The parsed EnhancementJob MUST NOT be NULL!");
+ }
+ this.enhancementJob = job;
+ this.semaphore = new Semaphore(1);
+ }
+
+ protected void acquire() {
+ try {
+ semaphore.acquire();
+ } catch (InterruptedException e) {
+ log.warn("Interrupted while acquireing Semaphore for EnhancementJob "
+ + enhancementJob + "!",e);
+ }
+ }
+
+ protected void release() {
+ semaphore.release();
+ }
+
+ public boolean hasCompleted() {
+ enhancementJob.getLock().readLock().lock();
+ try {
+ return enhancementJob.isFinished();
+ } finally {
+ enhancementJob.getLock().readLock().unlock();
+ }
+ }
+
+ public void waitForCompletion(int maxEnhancementJobWaitTime) {
+ if(semaphore.availablePermits() < 1){
+ // The only permit is taken by the EnhancementJobHander
+ try {
+ semaphore.tryAcquire(1,
+ Math.max(MIN_WAIT_TIME, maxEnhancementJobWaitTime),TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ //interupted
+ }
+ } else if(!hasCompleted()){
+ int wait = Math.max(100, maxEnhancementJobWaitTime/10);
+ log.warn("Unexpected permit available for Semaphore of "
+ + "EnhancementJob of ContentItem {}. Fallback to wait({})"
+ + "for detecting if Job has finished. While the fallback "
+ + "should ensure correct Enhancement results this indicates a "
+ + "Bug in the EventHobManager. Please feel free to report "
+ + "This on dev@stanbol.apache.org or the Apache Stanbol "
+ + "Issue Tracker.",enhancementJob.getContentItem().getUri(),wait);
+ try {
+ Thread.currentThread().wait(wait);
+ } catch (InterruptedException e) {
+ //interupted
+ }
+ }// else completed
+ }
+
+ }
+
+
/**
* Currently only used to debug the number of currently registered
* Enhancements Jobs (if there are some)
* @author Rupert Westenthaler
*/
- private class EnhancementJobObserver implements Runnable {
+ private class EnhancementJobObserverDaemon implements Runnable {
+ /**
+ * The logger of the Observer. Can be used to configure Loglevel specificly
+ *
+ */
+ private Logger observerLog = LoggerFactory.getLogger(EnhancementJobObserverDaemon.class);
+
@Override
public void run() {
- log.debug(" ... init EnhancementJobObserver");
+ observerLog.debug(" ... init EnhancementJobObserver");
while(processingJobs != null){
try {
Thread.sleep(10000);
@@ -382,13 +457,13 @@
readLock.unlock();
}
if(!jobs.isEmpty()){
- log.info(" -- {} active Enhancement Jobs",jobs.size());
- if(log.isDebugEnabled()){
+ observerLog.info(" -- {} active Enhancement Jobs",jobs.size());
+ if(observerLog.isDebugEnabled()){
for(EnhancementJob job : jobs){
Lock jobLock = job.getLock().readLock();
jobLock.lock();
try {
- logJobInfo(job,null);
+ logJobInfo(observerLog,job,null,true);
} finally {
jobLock.unlock();
}
diff --git a/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java b/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
index 234b9a3..4f5ad13 100644
--- a/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
+++ b/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
@@ -21,6 +21,7 @@
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
+import java.util.concurrent.Semaphore;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.felix.scr.annotations.Activate;
@@ -30,6 +31,7 @@
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.jobmanager.event.impl.EnhancementJobHandler.EnhancementJobObserver;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.ChainManager;
@@ -51,13 +53,18 @@
@Service
@Properties(value={
//register with a ranking lower than 0 to allow easy overriding by specific
- @Property(name=Constants.SERVICE_RANKING,intValue=EventJobManagerImpl.DEFAULT_SERVICE_RANKING)
+ @Property(name=Constants.SERVICE_RANKING,intValue=EventJobManagerImpl.DEFAULT_SERVICE_RANKING),
+ @Property(name=EventJobManagerImpl.MAX_ENHANCEMENT_JOB_WAIT_TIME,intValue=EventJobManagerImpl.DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME)
})
public class EventJobManagerImpl implements EnhancementJobManager {
private final Logger log = LoggerFactory.getLogger(EventJobManagerImpl.class);
public static final int DEFAULT_SERVICE_RANKING = 0;
+
+ public static final String MAX_ENHANCEMENT_JOB_WAIT_TIME = "stanbol.maxEnhancementJobWaitTime";
+
+ public static final int DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME = 10 * 1000;
@Reference
protected ChainManager chainManager;
@@ -68,6 +75,7 @@
private ServiceRegistration jobHandlerRegistration;
private EnhancementJobHandler jobHandler;
+ private int maxEnhancementJobWaitTime = DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME;
/**
@@ -84,6 +92,11 @@
properties.put(org.osgi.service.event.EventConstants.EVENT_TOPIC, TOPIC_JOB_MANAGER);
jobHandlerRegistration = ctx.getBundleContext().registerService(
EventHandler.class.getName(), jobHandler, properties);
+
+ Object maxWaitTime = ctx.getProperties().get(MAX_ENHANCEMENT_JOB_WAIT_TIME);
+ if (maxWaitTime instanceof Integer) {
+ this.maxEnhancementJobWaitTime = (Integer) maxWaitTime;
+ }
}
/**
* Unregisters the {@link EnhancementJobHandler}
@@ -120,23 +133,17 @@
}
if(chain == null){
throw new IllegalArgumentException("Unable to enhance ContentItem '"+ci.getUri()+
- "' because NULL was parsed as enhancement chain");
+ "' because NULL was passed as enhancement chain");
}
long start = System.currentTimeMillis();
boolean isDefaultChain = chain.equals(chainManager.getDefault());
EnhancementJob job = new EnhancementJob(ci, chain.getName(), chain.getExecutionPlan(),isDefaultChain);
//start the execution
//wait for the results
- Object object = jobHandler.register(job);
- while(!job.isFinished() & jobHandler != null){
- synchronized (object) {
- try {
- object.wait();
- } catch (InterruptedException e) {
- log.debug("Interupped for EnhancementJob if ContentItem {}",
- job.getContentItem().getUri());
- }
- }
+ EnhancementJobObserver observer = jobHandler.register(job);
+ //TODO: allow configuring a max completion time (e.g. 1min)
+ while(!observer.hasCompleted() & jobHandler != null){
+ observer.waitForCompletion(maxEnhancementJobWaitTime);
}
log.info("{} EnhancementJob for ContentItem {} after {}ms",
new Object[]{ job.isFailed() ? "Failed" : "Finished",
@@ -157,8 +164,8 @@
}
if(!job.isFinished()){
throw new ChainException("EnhancementJobManager was deactivated while" +
- "enhancing the parsed ContentItem "+job.getContentItem()+
- "(EnhancementJobManager type: "+getClass()+")!");
+ " enhancing the passed ContentItem "+job.getContentItem()+
+ " (EnhancementJobManager type: "+getClass()+")");
}
}
diff --git a/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties b/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties
index a108fb4..dfe65b6 100644
--- a/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ b/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -21,8 +21,12 @@
org.apache.stanbol.enhancer.jobmanager.event.impl.EventJobManagerImpl.description=EnhancementJobManager \
implementation that used the org.osgi.service.event framework for asynchronously enhancing \
content items.
+stanbol.maxEnhancementJobWaitTime.name=Job timeout (ms)
+stanbol.maxEnhancementJobWaitTime.description=Maximum time in milliseconds to wait for job completion \
+before aborting.
service.ranking.name=Ranking
service.ranking.description=The service.ranking for this EnhancementJobManager implementation. \
If different enhancement job manager are active the one with the highest rank will be used to \
enhance content parsed to the Stanbol Enhancer RESTful interface.
+
diff --git a/enhancer/jobmanager/pom.xml b/enhancer/jobmanager/pom.xml
index ae76988..4a0f726 100644
--- a/enhancer/jobmanager/pom.xml
+++ b/enhancer/jobmanager/pom.xml
@@ -33,12 +33,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
diff --git a/enhancer/jobmanager/weightedjobmanager/pom.xml b/enhancer/jobmanager/weightedjobmanager/pom.xml
index 8693682..6154d4d 100644
--- a/enhancer/jobmanager/weightedjobmanager/pom.xml
+++ b/enhancer/jobmanager/weightedjobmanager/pom.xml
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,6 +58,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.jobmanager.impl.*;version=${project.version}
</Private-Package>
diff --git a/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties b/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
index 671548c..e1ec85e 100644
--- a/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
+++ b/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
@@ -1,16 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
+# - 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
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:01:54 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:04:02 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/ldpath/pom.xml b/enhancer/ldpath/pom.xml
index 98a31c2..6ad9c77 100644
--- a/enhancer/ldpath/pom.xml
+++ b/enhancer/ldpath/pom.xml
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/ldpath/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/ldpath/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/ldpath/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/ldpath/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,6 +57,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ at.newmedialab.ldpath.api.backend; provide:=true,
+ at.newmedialab.ldpath.api.functions; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.ldpath.*
</Export-Package>
diff --git a/enhancer/ldpath/src/license/THIRD-PARTY.properties b/enhancer/ldpath/src/license/THIRD-PARTY.properties
index 4e047fd..ed7688a 100644
--- a/enhancer/ldpath/src/license/THIRD-PARTY.properties
+++ b/enhancer/ldpath/src/license/THIRD-PARTY.properties
@@ -19,8 +19,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Mar 15 13:33:42 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08:19 CEST 2012
+javax.servlet--servlet-api--2.5=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
diff --git a/enhancer/parent/pom.xml b/enhancer/parent/pom.xml
index 4170b19..4a32829 100644
--- a/enhancer/parent/pom.xml
+++ b/enhancer/parent/pom.xml
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/parent/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/parent/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/parent/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/parent/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
diff --git a/enhancer/pom.xml b/enhancer/pom.xml
index 9062e68..84dcef5 100644
--- a/enhancer/pom.xml
+++ b/enhancer/pom.xml
@@ -21,31 +21,40 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>10</version>
- <relativePath />
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.reactor</artifactId>
+ <artifactId>apache-stanbol-enhancer</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Stanbol Enhancer Reactor</name>
+ <name>Apache Stanbol Enhancer</name>
<description>
Pseudo project to build the complete Stanbol Enhancer component
</description>
+
<inceptionYear>2010</inceptionYear>
+ <licenses>
+ <license>
+ <name>Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
@@ -69,5 +78,82 @@
<module>benchmark</module>
<module>defaults</module>
<module>bundlelist</module>
+
</modules>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!--
+ All license headers are also checked per
+ artifact. These excludes are necessary
+ to make the reactor build suceed. Consider
+ the excluded files here as already checked
+ in the artifacts.
+ -->
+
+ <!-- exclude hidden files -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/*</exclude>
+ <exclude>**/.*/**/*</exclude>
+
+ <!-- exclude build files -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- exclude generated files listing the licenses of deps -->
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>DEPENDENCIES-BY-LICENSE</exclude>
+ <exclude>RAT-REPORT</exclude>
+ <exclude>**/src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- exclude certain file types -->
+ <exclude>**/*.config</exclude>
+ <exclude>**/*.cfg</exclude>
+ <exclude>**/*.ref</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.tsv</exclude>
+ <exclude>**/*.sem</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/*.css</exclude>
+
+ <!-- exclude test files -->
+ <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>
+ <exclude>**/test/**/*.odt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate-add-third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/enhancer/topic-web/pom.xml b/enhancer/topic-web/pom.xml
index e9256a4..b16c9c5 100644
--- a/enhancer/topic-web/pom.xml
+++ b/enhancer/topic-web/pom.xml
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/topic-web/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/topic-web/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -64,6 +64,7 @@
</Embed-Dependency>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
@@ -114,6 +115,10 @@
<!-- Jersey -->
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ </dependency>
+<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
diff --git a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
index a9a592b..721ab01 100644
--- a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
+++ b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
@@ -75,11 +75,6 @@
}
@Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
-
- @Override
public List<LinkResource> getLinkResources() {
return Collections.emptyList();
}
diff --git a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
index 2faba93..f1f2dcf 100644
--- a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
+++ b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
@@ -41,7 +41,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/topic")
public class TopicClassifierRootResource extends BaseStanbolResource {
diff --git a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
index 4388e98..557ab75 100644
--- a/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
+++ b/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
@@ -55,7 +55,7 @@
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* RESTful interface for classification models: register concept hierarchies, introspect model state and
diff --git a/enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl b/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl
similarity index 100%
rename from enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl
rename to enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl
diff --git a/enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl b/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl
similarity index 100%
rename from enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl
rename to enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl
