Author: rwesten
Date: Thu Feb 16 19:15:58 2012
New Revision: 1245125
URL: http://svn.apache.org/viewvc?rev=1245125&view=rev
Log:
fixes STANBOL-496: Stanbol now uses LDPath version 0.9.5
Modified:
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Modified:
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java?rev=1245125&r1=1245124&r2=1245125&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
(original)
+++
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
Thu Feb 16 19:15:58 2012
@@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Set;
+import java.util.concurrent.ThreadPoolExecutor;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Language;
@@ -338,4 +339,13 @@ public class ClerezzaBackend implements
throw new IllegalArgumentException("Resource " +
resource.toString() + " is not a TypedLiteral");
}
}
+
+ @Override
+ public boolean supportsThreading() {
+ return false;
+ }
+ @Override
+ public ThreadPoolExecutor getThreadPool() {
+ return null;
+ }
}
\ No newline at end of file
Modified:
incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java?rev=1245125&r1=1245124&r2=1245125&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
(original)
+++
incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
Thu Feb 16 19:15:58 2012
@@ -32,6 +32,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import java.util.concurrent.ThreadPoolExecutor;
import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory;
import org.apache.stanbol.entityhub.servicesapi.EntityhubException;
@@ -110,7 +111,8 @@ public abstract class AbstractBackend im
} else {
this.valueConverter = valueConverter;
}
- } protected abstract ValueFactory getValueFactory();
+ }
+ protected abstract ValueFactory getValueFactory();
protected abstract Representation getRepresentation(String id) throws
EntityhubException;
@@ -119,16 +121,21 @@ public abstract class AbstractBackend im
protected abstract FieldQuery createQuery();
@Override
- public String createLiteral(String content) {
- return content;
+ public boolean supportsThreading() {
+ return false;
+ }
+ @Override
+ public ThreadPoolExecutor getThreadPool() {
+ return null;
+ }
+ @Override
+ public Object createLiteral(String content) {
+ return getValueFactory().createText(content);
}
@Override
public Object createLiteral(String content, Locale language, URI type) {
DataTypeEnum dataType = type == null ? null :
DataTypeEnum.getDataType(type.toString());
- if(language == null && type == null){
- return content;
- }
if(language != null){
if(type != null && !(DataTypeEnum.String == dataType ||
DataTypeEnum.Text == dataType)){
throw new IllegalArgumentException("Literals with a Lanugage
MUST not have NULL,"+
@@ -150,7 +157,7 @@ public abstract class AbstractBackend im
}
}
} else { //language is null and type is null
- return content;
+ return getValueFactory().createText(content);
}
}
Modified:
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1245125&r1=1245124&r2=1245125&view=diff
==============================================================================
---
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Thu Feb 16 19:15:58 2012
@@ -373,12 +373,12 @@
<bundle> <!-- LD Path -->
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-api</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-core-bundle</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1245125&r1=1245124&r2=1245125&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Thu Feb 16 19:15:58 2012
@@ -893,7 +893,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1490,12 +1490,12 @@
<dependency>
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-api</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-core-bundle</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -1695,12 +1695,13 @@
<version>3.2.2</version>
<scope>test</scope>
</dependency>
+ <!-- already present
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>1.6.0</version>
<scope>test</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-paxrunner</artifactId>
