Author: rwesten
Date: Fri Aug 29 07:47:23 2014
New Revision: 1621253
URL: http://svn.apache.org/r1621253
Log:
STANBOL-621: updated to Apache Jena. The used versions are the same the the
latest used by Apache Clerezza Ext modules
Modified:
stanbol/trunk/commons/owl/pom.xml
stanbol/trunk/parent/pom.xml
stanbol/trunk/reasoners/jena/pom.xml
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/rules/adapters/jena/pom.xml
stanbol/trunk/rules/base/pom.xml
stanbol/trunk/rules/manager/pom.xml
stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
stanbol/trunk/rules/refactor/pom.xml
stanbol/trunk/rules/web/pom.xml
Modified: stanbol/trunk/commons/owl/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/pom.xml (original)
+++ stanbol/trunk/commons/owl/pom.xml Fri Aug 29 07:47:23 2014
@@ -131,12 +131,12 @@
<!-- OWL deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
</dependency>
<dependency>
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Fri Aug 29 07:47:23 2014
@@ -1004,8 +1004,59 @@
<version>1.9.11</version>
</dependency>
- <!-- Jena -->
+ <!-- Jena (and Clerezza Jena Modules)-->
<dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.11.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-core</artifactId>
+ <version>2.11.1_1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-tdb</artifactId>
+ <version>1.0.1_1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-arq</artifactId>
+ <version>2.11.1_1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-iri</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.apache.jena.jena-iri</artifactId>
+ <version>1.0.1_1</version>
+ </dependency>
+
+ <!-- old Jena Dependencies -->
+ <!-- dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.3</version>
@@ -1050,7 +1101,7 @@
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.hsqldb</groupId>
Modified: stanbol/trunk/reasoners/jena/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/jena/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/reasoners/jena/pom.xml (original)
+++ stanbol/trunk/reasoners/jena/pom.xml Fri Aug 29 07:47:23 2014
@@ -84,6 +84,11 @@
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!-- Jena dependency -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ </dependency>
<!-- Diagnostic dependencies -->
<dependency>
@@ -124,18 +129,6 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <type>jar</type>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
Modified: stanbol/trunk/reasoners/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Fri Aug 29 07:47:23 2014
@@ -198,9 +198,9 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <!-- dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -208,7 +208,7 @@
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency -->
<!-- Testing deps -->
<dependency>
Modified: stanbol/trunk/rules/adapters/jena/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/jena/pom.xml (original)
+++ stanbol/trunk/rules/adapters/jena/pom.xml Fri Aug 29 07:47:23 2014
@@ -98,8 +98,8 @@
<!-- Jena deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Testing deps -->
Modified: stanbol/trunk/rules/base/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/base/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/rules/base/pom.xml (original)
+++ stanbol/trunk/rules/base/pom.xml Fri Aug 29 07:47:23 2014
@@ -80,8 +80,8 @@
<!-- OWL deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Persistence -->
Modified: stanbol/trunk/rules/manager/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/rules/manager/pom.xml (original)
+++ stanbol/trunk/rules/manager/pom.xml Fri Aug 29 07:47:23 2014
@@ -112,14 +112,14 @@
</dependency>
<!-- OWL deps -->
- <dependency>
+ <!-- dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>arq</artifactId>
- </dependency>
+ </dependency -->
<!-- Persistence deps -->
<dependency>
Modified:
stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
---
stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
(original)
+++
stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
Fri Aug 29 07:47:23 2014
@@ -17,11 +17,13 @@
package org.apache.stanbol.rules.manager.arqextention;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory;
import com.hp.hpl.jena.sparql.core.Var;
import com.hp.hpl.jena.sparql.engine.ExecutionContext;
import com.hp.hpl.jena.sparql.engine.QueryIterator;
import com.hp.hpl.jena.sparql.engine.binding.Binding;
import com.hp.hpl.jena.sparql.engine.binding.Binding1;
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArg;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArgType;
import com.hp.hpl.jena.sparql.pfunction.PropertyFunctionEval;
@@ -45,8 +47,9 @@ public class CreateURI extends PropertyF
Node ref = argumentSubject.getArg();
if (ref.isVariable()) {
String argumentString =
argumentObject.getArg().toString().replace("\"", "");
-
- b = new Binding1(binding, Var.alloc(ref),
Node.createURI(argumentString));
+ //STANBOL-621: Binding1 has no longer a public constructor
+ //b = new Binding1(binding, Var.alloc(ref),
NodeFactory.createURI(argumentString));
+ b = BindingFactory.binding(binding, Var.alloc(ref),
NodeFactory.createURI(argumentString));
}
}
Modified: stanbol/trunk/rules/refactor/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/rules/refactor/pom.xml (original)
+++ stanbol/trunk/rules/refactor/pom.xml Fri Aug 29 07:47:23 2014
@@ -106,12 +106,12 @@
<!-- OWL deps -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<!-- Persistence deps -->
Modified: stanbol/trunk/rules/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1621253&r1=1621252&r2=1621253&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Fri Aug 29 07:47:23 2014
@@ -125,8 +125,8 @@
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
</dependency>
<dependency>
