Author: rwesten
Date: Mon May 26 11:20:40 2014
New Revision: 1597562
URL: http://svn.apache.org/r1597562
Log:
merged fix for STANBOL-1345 to trunk
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/ (props changed)
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
stanbol/trunk/entityhub/indexing/dbpedia/pom.xml
stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1597561
Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/commons:r1597561
Modified:
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java?rev=1597562&r1=1597561&r2=1597562&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/mappings/DefaultNamespaceMappingsEnum.java
Mon May 26 11:20:40 2014
@@ -105,7 +105,7 @@ public enum DefaultNamespaceMappingsEnum
georss("http://www.georss.org/georss/";),
gml("http://www.opengis.net/gml/";),
dcElements("dc-elements","http://purl.org/dc/elements/1.1/";),
- dcTerms("dc","http://purl.org/dc/terms/";), // Entityhub prefers DC-Terms,
therefore use the "dc" prefix for the terms name space
+ dcTerms("dct","http://purl.org/dc/terms/";),
foaf("http://xmlns.com/foaf/0.1/";),
vCal("http://www.w3.org/2002/12/cal#";),
vCard("http://www.w3.org/2001/vcard-rdf/3.0#";),
@@ -225,6 +225,29 @@ public enum DefaultNamespaceMappingsEnum
* href="https://issues.apache.org/jira/browse/STANBOL-488";>STANBOL-488</<>
*/
ehp("http://stanbol.apache.org/ontology/enhancementproperties#";),
+ /*
+ * Added several mappings form prefix.cc for namespaces defined above
+ */
+ /**
+ * Alternative to {@link #dcElements}
+ */
+ dce("http://purl.org/dc/elements/1.1/";),
+ /**
+ * Alternative for {@link #dbpedia_ont}
+ */
+ dbo("http://dbpedia.org/ontology/";),
+ /**
+ * DBpedia resources
+ */
+ dbr("http://dbpedia.org/resource/";),
+ /**
+ * Alternative to {@link #dbpediaProp}
+ */
+ dbp("http://dbpedia.org/property/";),
+ /**
+ * Alternative to {@link #geonames}
+ */
+ gn("http://www.geonames.org/ontology#";)
;
private String namespace;
private String prefix;
Modified: stanbol/trunk/entityhub/indexing/dbpedia/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/dbpedia/pom.xml?rev=1597562&r1=1597561&r2=1597562&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/dbpedia/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/dbpedia/pom.xml Mon May 26 11:20:40 2014
@@ -196,11 +196,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- for testing -->
<dependency>
Modified: stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml?rev=1597562&r1=1597561&r2=1597562&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml Mon May 26
11:20:40 2014
@@ -136,11 +136,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
