Author: fchrist
Date: Thu May 31 09:53:50 2012
New Revision: 1344625
URL: http://svn.apache.org/viewvc?rev=1344625&view=rev
Log:
STANBOL-637 The warning message is now property with a default in the parent
POM that can be overriden in child POMs
Modified:
incubator/stanbol/trunk/data/parent/pom.xml
incubator/stanbol/trunk/data/sites/dbpedia/pom.xml
incubator/stanbol/trunk/data/sites/dbpedia/src/main/resources/README
Modified: incubator/stanbol/trunk/data/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/parent/pom.xml?rev=1344625&r1=1344624&r2=1344625&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/parent/pom.xml (original)
+++ incubator/stanbol/trunk/data/parent/pom.xml Thu May 31 09:53:50 2012
@@ -48,6 +48,17 @@
<url>http://incubator.apache.org/stanbol</url>
</scm>
+ <properties>
+ <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>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
@@ -86,16 +97,9 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <echo>
-*
-* 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
-*
- </echo>
- </tasks>
+ <target>
+ <echo>${downloadWarning}</echo>
+ </target>
</configuration>
</execution>
</executions>
Modified: incubator/stanbol/trunk/data/sites/dbpedia/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/sites/dbpedia/pom.xml?rev=1344625&r1=1344624&r2=1344625&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/sites/dbpedia/pom.xml (original)
+++ incubator/stanbol/trunk/data/sites/dbpedia/pom.xml Thu May 31 09:53:50 2012
@@ -34,8 +34,8 @@
<name>Apache Stanbol Data: DBpedia.org</name>
<description>
- This bundle allows to use DBpedia as Referenced Site. It also
- includes a small local index that contains 43k entities.
+ This bundle allows to use DBpedia as Referenced Site. The build
+ also downloads a small DBPedia index that contains 43k entities.
This index can be upgrated to an bigger version by copying a
dbpedia.solrindex.zip file into the Stanbol /datafiles folder.
</description>
@@ -51,16 +51,44 @@
</developerConnection>
<url>http://incubator.apache.org/stanbol/</url>
</scm>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dbpedia.default.index.url>http://www.salzburgresearch.at/~rwesten/stanbol/dbpedia_43k.solrindex.zip</dbpedia.default.index.url>
<dbpedia.default.path>org/apache/stanbol/data/site/dbpedia/default</dbpedia.default.path>
<dbpedia.default.index.path>${dbpedia.default.path}/index</dbpedia.default.index.path>
<dbpedia.default.config.path>${dbpedia.default.path}/config</dbpedia.default.config.path>
+ <downloadWarning>
+*
+* WARNING - this build downloads a DPBedia index for 43k entities
+* that is *not* licensed under the Apache License, but under the
+* Creative Commons Attribution-ShareAlike 3.0 Unported License.
+*
+ </downloadWarning>
</properties>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!--
+ Ant is used to download the datafiles over the
+ web
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -133,14 +161,14 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <!-- License provided in src/main/resources/README -->
+ <!-- AL20 licensed. See src/main/resources/README -->
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/config/dbpedia.solrindex.ref</exclude>
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-dbpedia.config</exclude>
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbpedia.config</exclude>
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config</exclude>
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbpedia.config</exclude>
- <!-- Downloaded during the build process, therefore not part of
the source tree -->
+ <!-- Licensed under Creative Commons Attribution-ShareAlike 3.0
Unported License -->
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/index/dbpedia_43k.solrindex.zip</exclude>
</excludes>
</configuration>
Modified: incubator/stanbol/trunk/data/sites/dbpedia/src/main/resources/README
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/sites/dbpedia/src/main/resources/README?rev=1344625&r1=1344624&r2=1344625&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/sites/dbpedia/src/main/resources/README
(original)
+++ incubator/stanbol/trunk/data/sites/dbpedia/src/main/resources/README Thu
May 31 09:53:50 2012
@@ -15,8 +15,12 @@ limitations under the License.
The following files are provided under the Apache License, Version 2.0:
- org/apache/stanbol/data/site/dbpedia/default/config/dbpedia.solrindex.ref
-
org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-dbpedia.config
-
org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbpedia.config
-
org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config
-
org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbpedia.config
+org/apache/stanbol/data/site/dbpedia/default/config/dbpedia.solrindex.ref
+org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-dbpedia.config
+org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbpedia.config
+org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config
+org/apache/stanbol/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbpedia.config
+
+The following file is licensed under Creative Commons Attribution-ShareAlike
3.0 Unported License:
+
+org/apache/stanbol/data/site/dbpedia/default/index/dbpedia_43k.solrindex.zip
