You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2016/09/02 11:06:44 UTC
svn commit: r1758937 - in /stanbol/trunk:
commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/
enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/
launchers/full-war/ launchers/full/ launchers/mini-wa...
Author: rwesten
Date: Fri Sep 2 11:06:44 2016
New Revision: 1758937
URL: http://svn.apache.org/viewvc?rev=1758937&view=rev
Log:
fixed a lot of bugs related to the Clerezza 1.0 upgrade (lot of unit tests, updates to the Clerzza LDPath Backend to still support parsing data type values from literals without data types)
Modified:
stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini-war/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable-war/pom.xml
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/parent/pom.xml
stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
Modified: stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java (original)
+++ stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/ClerezzaBackend.java Fri Sep 2 11:06:44 2016
@@ -20,8 +20,11 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.concurrent.ThreadPoolExecutor;
@@ -61,6 +64,11 @@ public class ClerezzaBackend extends Abs
private static final Logger logger = LoggerFactory.getLogger(ClerezzaBackend.class);
+ private static final Collection<IRI> STRING_DATATYPES = Collections.unmodifiableCollection(new HashSet<IRI>(Arrays.asList(
+ new IRI("http://www.w3.org/2001/XMLSchema#string"),
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"),
+ null)));
+
/**
* Enumeration containing supported XSD dataTypes including <ul>
* <li> local name
@@ -187,7 +195,7 @@ public class ClerezzaBackend extends Abs
@Override
public Double doubleValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return LiteralFactory.getInstance().createObject(Double.class, (Literal) resource);
} else {
return super.doubleValue(resource);
@@ -275,7 +283,7 @@ public class ClerezzaBackend extends Abs
@Override
public Long longValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Long.class, (Literal) resource);
} else {
return super.longValue(resource);
@@ -295,7 +303,7 @@ public class ClerezzaBackend extends Abs
@Override
public Boolean booleanValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Boolean.class, (Literal) resource);
} else {
return super.booleanValue(resource);
@@ -304,7 +312,7 @@ public class ClerezzaBackend extends Abs
@Override
public Date dateTimeValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Date.class, (Literal) resource);
} else {
return super.dateTimeValue(resource);
@@ -313,7 +321,7 @@ public class ClerezzaBackend extends Abs
@Override
public Date dateValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Date.class, (Literal) resource);
} else {
return super.dateValue(resource);
@@ -322,7 +330,7 @@ public class ClerezzaBackend extends Abs
@Override
public Date timeValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Date.class, (Literal) resource);
} else {
return super.timeValue(resource);
@@ -331,7 +339,7 @@ public class ClerezzaBackend extends Abs
@Override
public Float floatValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Float.class, (Literal) resource);
} else {
return super.floatValue(resource);
@@ -340,7 +348,7 @@ public class ClerezzaBackend extends Abs
@Override
public Integer intValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(Integer.class, (Literal) resource);
} else {
return super.intValue(resource);
@@ -349,13 +357,18 @@ public class ClerezzaBackend extends Abs
@Override
public BigInteger integerValue(RDFTerm resource) {
- if (resource instanceof Literal) {
+ if (isDataTypeLiteral(resource)) {
return lf.createObject(BigInteger.class, (Literal) resource);
} else {
return super.integerValue(resource);
}
}
+ private boolean isDataTypeLiteral(RDFTerm resource){
+ return resource instanceof Literal &&
+ !STRING_DATATYPES.contains(((Literal)resource).getDataType());
+ }
+
@Override
public BigDecimal decimalValue(RDFTerm resource) {
//currently there is no converter for BigDecimal in clerezza
Modified: stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java (original)
+++ stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java Fri Sep 2 11:06:44 2016
@@ -230,6 +230,7 @@ public class SuggestionFunction extends
}
} catch (RuntimeException e) {
log.warn("Unable to parse parameter 'limit' form the {}nd argument '{}'",index, value);
+ log.warn("Stacktrace:", e);
}
}
return limit;
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Fri Sep 2 11:06:44 2016
@@ -139,7 +139,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
@@ -148,7 +147,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
@@ -172,13 +170,13 @@
</dependency>
<!-- Clerezza zz> Shell Bundle List -->
- <dependency>
+ <!-- dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>shell</artifactId>
<version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency -->
<!-- Stanbol Data Bundle List -->
<dependency>
Modified: stanbol/trunk/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Fri Sep 2 11:06:44 2016
@@ -191,7 +191,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
@@ -200,7 +199,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
@@ -227,7 +225,6 @@
<!-- <dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>shell</artifactId>
- <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency> -->
Modified: stanbol/trunk/launchers/mini-war/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini-war/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini-war/pom.xml (original)
+++ stanbol/trunk/launchers/mini-war/pom.xml Fri Sep 2 11:06:44 2016
@@ -139,7 +139,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Fri Sep 2 11:06:44 2016
@@ -190,7 +190,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/stable-war/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable-war/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable-war/pom.xml (original)
+++ stanbol/trunk/launchers/stable-war/pom.xml Fri Sep 2 11:06:44 2016
@@ -143,7 +143,6 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Fri Sep 2 11:06:44 2016
@@ -192,19 +192,17 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
<!-- Clerezza Jena TDB storage (used by Ontonet) -->
- <dependency>
+ <!-- dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>1.0.0</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency -->
<!-- Stanbol Commons Bundle List -->
<dependency>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Fri Sep 2 11:06:44 2016
@@ -625,18 +625,37 @@
<artifactId>org.apache.felix.webconsole</artifactId>
<version>4.2.8</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf</artifactId>
+ <version>1.1.1</version>
+ <type>partialbundlelist</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>rdf.tdb</artifactId>
+ <version>1.1.1</version>
+ <type>partialbundlelist</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>shell</artifactId>
+ <version>0.1</version>
+ <type>partialbundlelist</type>
+ </dependency>
+
<!-- Apache Clerezza and runtime dependencies -->
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.ibm.icu</artifactId>
- <version>0.5-incubating</version>
+ <version>0.6</version>
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>wymiwyg-commons-core</artifactId>
- <version>0.7.6</version>
+ <version>0.8</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java Fri Sep 2 11:06:44 2016
@@ -21,17 +21,12 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
-import junit.framework.Assert;
import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.sparql.ParseException;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.core.sparql.QueryParser;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
-import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
-import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
import org.apache.stanbol.rules.adapters.clerezza.ClerezzaAdapter;
import org.apache.stanbol.rules.adapters.impl.RuleAdaptersFactoryImpl;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -47,6 +42,7 @@ import org.apache.stanbol.rules.manager.
import org.apache.stanbol.rules.manager.parse.RuleParserImpl;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -71,17 +67,7 @@ public class ClerezzaAdpterTest {
@BeforeClass
public static void setUpClass() {
- class SpecialTcManager extends TcManager {
- public SpecialTcManager(QueryEngine qe, WeightedTcProvider wtcp) {
- super();
- bindQueryEngine(qe);
- bindWeightedTcProvider(wtcp);
- }
- }
-
- QueryEngine qe = new JenaSparqlEngine();
- WeightedTcProvider wtcp = new SimpleTcProvider();
- TcManager tcm = new SpecialTcManager(qe, wtcp);
+ TcManager tcm = TcManager.getInstance();//new SpecialTcManager(qe, wtcp);
Dictionary<String,Object> configuration = new Hashtable<String,Object>();
RuleAdaptersFactory ruleAdaptersFactory = new RuleAdaptersFactoryImpl();
Modified: stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original)
+++ stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Fri Sep 2 11:06:44 2016
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -75,9 +74,6 @@ public class RefactorerImpl implements R
protected TcManager tcManager;
@Reference
- protected WeightedTcProvider weightedTcProvider;
-
- @Reference
protected RuleAdapterManager ruleAdapterManager;
/**
@@ -97,7 +93,6 @@ public class RefactorerImpl implements R
/**
* Basic constructor to be used if outside of an OSGi environment. Invokes default constructor.
*
- * @param weightedTcProvider
* @param serializer
* @param tcManager
* @param semionManager
@@ -105,13 +100,11 @@ public class RefactorerImpl implements R
* @param kReSReasoner
* @param configuration
*/
- public RefactorerImpl(WeightedTcProvider weightedTcProvider,
- TcManager tcManager,
+ public RefactorerImpl(TcManager tcManager,
RuleStore ruleStore,
RuleAdapterManager ruleAdapterManager,
Dictionary<String,Object> configuration) {
this();
- this.weightedTcProvider = weightedTcProvider;
this.tcManager = tcManager;
this.ruleStore = ruleStore;
this.ruleAdapterManager = ruleAdapterManager;
@@ -148,7 +141,6 @@ public class RefactorerImpl implements R
protected void deactivate(ComponentContext context) {
log.info("in " + getClass() + " deactivate with context " + context);
- this.weightedTcProvider = null;
this.tcManager = null;
this.ruleStore = null;
}
@@ -156,7 +148,7 @@ public class RefactorerImpl implements R
@Override
public Graph getRefactoredDataSet(IRI uriRef) {
- return weightedTcProvider.getGraph(uriRef);
+ return tcManager.getGraph(uriRef);
}
/**
@@ -168,7 +160,7 @@ public class RefactorerImpl implements R
*/
private ImmutableGraph sparqlConstruct(ConstructQuery constructQuery, IRI datasetID) {
- Graph graph = weightedTcProvider.getGraph(datasetID);
+ Graph graph = tcManager.getGraph(datasetID);
return sparqlConstruct(constructQuery, graph);
}
Modified: stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java?rev=1758937&r1=1758936&r2=1758937&view=diff
==============================================================================
--- stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java (original)
+++ stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java Fri Sep 2 11:06:44 2016
@@ -23,15 +23,11 @@ import java.io.InputStream;
import java.util.Dictionary;
import java.util.Hashtable;
-import junit.framework.Assert;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
import org.apache.stanbol.commons.owl.transformation.JenaToClerezzaConverter;
import org.apache.stanbol.rules.adapters.clerezza.ClerezzaAdapter;
@@ -52,6 +48,7 @@ import org.apache.stanbol.rules.refactor
import org.apache.stanbol.rules.refactor.impl.RefactorerImpl;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -77,17 +74,7 @@ public class RefactoringTest {
// recipeIRI = IRI.create("http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyTestRecipe");
- class SpecialTcManager extends TcManager {
- public SpecialTcManager(QueryEngine qe, WeightedTcProvider wtcp) {
- super();
- bindQueryEngine(qe);
- bindWeightedTcProvider(wtcp);
- }
- }
-
- QueryEngine qe = new JenaSparqlEngine();
- WeightedTcProvider wtcp = new SimpleTcProvider();
- tcm = new SpecialTcManager(qe, wtcp);
+ tcm = TcManager.getInstance();
Dictionary<String,Object> configuration = new Hashtable<String,Object>();
store = new ClerezzaRuleStore(configuration, tcm);
@@ -104,7 +91,7 @@ public class RefactoringTest {
Dictionary<String,Object> configuration4 = new Hashtable<String,Object>();
- refactorer = new RefactorerImpl(wtcp, tcm, store, ruleAdapterManager, configuration4);
+ refactorer = new RefactorerImpl(tcm, store, ruleAdapterManager, configuration4);
}
@AfterClass