Author: fchrist
Date: Wed Mar 28 11:51:08 2012
New Revision: 1306273
URL: http://svn.apache.org/viewvc?rev=1306273&view=rev
Log:
STANBOL-557 merge NOTICE and LICENSE changes from trunk
Removed:
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/appended-resources/
Modified:
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/ (props
changed)
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/pom.xml
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/resources/README
Propchange: incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/stanbol/trunk/data/sites/dbpedia:1301064-1306270
Modified: incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/pom.xml?rev=1306273&r1=1306272&r2=1306273&view=diff
==============================================================================
--- incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/pom.xml
(original)
+++ incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/pom.xml Wed
Mar 28 11:51:08 2012
@@ -139,6 +139,8 @@
<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 -->
<exclude>src/main/resources/org/apache/stanbol/data/site/dbpedia/default/index/dbpedia_43k.solrindex.zip</exclude>
</excludes>
</configuration>
Modified:
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/resources/README
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/resources/README?rev=1306273&r1=1306272&r2=1306273&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/resources/README
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/data/sites/dbpedia/src/main/resources/README
Wed Mar 28 11:51:08 2012
@@ -15,24 +15,8 @@ limitations under the License.
The following files are provided under the Apache License, Version 2.0:
- org/apache/data/site/dbpedia/default/config/dbpedia_43k.solrindex.ref
-
org/apache/data/site/dbpedia/default/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-dbpedia.config
-
org/apache/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbpedia.config
-
org/apache/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.site.referencedSite-dbpedia.config
-
org/apache/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbpedia.config
-
-The SolrIndex provided at
-
- org/apache/data/site/dbpedia/default/index/dbpedia_43k.solrindex.zip
-
-contains Information dual licensed under
-
-
http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License
-
http://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
-
-The addition of the required attributions are ensured by the implementation of
-the Apache Stanbol Entityhub ReferencedSite based on the configurations
provided
-by
-
-
org/apache/data/site/dbpedia/default/config/org.apache.stanbol.entityhub.site.referencedSite-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
