Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3604] trunk
|
From: <lor...@us...> - 2012-03-05 12:12:47
|
Revision: 3604
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3604&view=rev
Author: lorenz_b
Date: 2012-03-05 12:12:37 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
Updated JENA libs.
Modified Paths:
--------------
trunk/components-core/pom.xml
trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtendedQueryEngineHTTP.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/HttpQuery.java
trunk/pom.xml
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2012-03-01 09:32:01 UTC (rev 3603)
+++ trunk/components-core/pom.xml 2012-03-05 12:12:37 UTC (rev 3604)
@@ -93,12 +93,15 @@
<dependency>
<groupId>org.aksw.commons</groupId>
<artifactId>sparql</artifactId>
- <version>0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>arq</artifactId>
+ <groupId>com.hp.hpl.jena</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -125,18 +128,10 @@
<artifactId>log4j</artifactId>
</dependency>
- <!-- Available via central, we use the latest with minor mods to DL Learner
- source (IE Dig related code) -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ </dependency>
<!--JSON is in Central -->
<dependency>
@@ -180,17 +175,10 @@
</dependency>
- <!--JENA ARQ is in central - we use the latest -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -230,7 +218,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>20041127.091804</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -245,5 +233,10 @@
<artifactId>jwnl</artifactId>
<version>1.4.1.RC2</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.5.0</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtendedQueryEngineHTTP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtendedQueryEngineHTTP.java 2012-03-01 09:32:01 UTC (rev 3603)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/ExtendedQueryEngineHTTP.java 2012-03-05 12:12:37 UTC (rev 3604)
@@ -19,24 +19,32 @@
package org.dllearner.kb.sparql;
-import com.hp.hpl.jena.query.*;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.hp.hpl.jena.query.ARQ;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.sparql.engine.http.HttpParams;
import com.hp.hpl.jena.sparql.engine.http.Params;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
+import com.hp.hpl.jena.sparql.graph.GraphFactory;
import com.hp.hpl.jena.sparql.resultset.XMLInput;
import com.hp.hpl.jena.sparql.util.Context;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory;
import com.hp.hpl.jena.util.FileManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
/**
* Created by Claus Stadler
* Date: Oct 25, 2010
@@ -364,6 +372,11 @@
public Dataset getDataset() {
return null;
}
+
+ @Override
+ public Query getQuery() {
+ return QueryFactory.create(queryString);
+ }
}
/*
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/HttpQuery.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/HttpQuery.java 2012-03-01 09:32:01 UTC (rev 3603)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/HttpQuery.java 2012-03-05 12:12:37 UTC (rev 3604)
@@ -37,12 +37,11 @@
import java.util.List;
import java.util.Map;
-import org.openjena.atlas.lib.Base64;
+import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.query.ARQ;
-import com.hp.hpl.jena.sdb.util.Pair;
import com.hp.hpl.jena.shared.JenaException;
import com.hp.hpl.jena.sparql.ARQInternalErrorException;
import com.hp.hpl.jena.sparql.engine.http.HttpParams;
@@ -293,7 +292,7 @@
// Build string, get as UTF-8, bytes, translate to base 64.
StringBuffer x = new StringBuffer() ;
byte b[] = x.append(user).append(":").append(password).toString().getBytes("UTF-8") ;
- String y = Base64.encodeBytes(b) ;
+ String y = Base64.encodeBase64String(b);
httpConnection.setRequestProperty("Authorization", "Basic "+y) ;
// Overwrite any password details we copied.
// Still leaves the copy in the HTTP connection. But this only basic auth.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-03-01 09:32:01 UTC (rev 3603)
+++ trunk/pom.xml 2012-03-05 12:12:37 UTC (rev 3604)
@@ -162,9 +162,9 @@
<!--Available via central, we use the latest with minor mods to DL Learner
source (IE Dig related code) -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.4</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.7.0-incubating</version>
</dependency>
<!--SwingX is in central -->
<dependency>
@@ -221,11 +221,10 @@
</dependency>
- <!--JENA ARQ is in central - we use the latest -->
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- <version>2.8.8</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.9.0-incubating</version>
</dependency>
<!--Junits -->
@@ -302,7 +301,7 @@
<dependency>
<groupId>org.aksw.commons</groupId>
<artifactId>sparql</artifactId>
- <version>${aksw.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.aksw.commons</groupId>
@@ -542,6 +541,13 @@
<name>Semanticscience projects</name>
<url>http://s1.semanticscience.org:8080/nexus/content/groups/public/</url>
</repository>
+ <repository>
+ <id>apache-repo-releases</id>
+ <url>https://repository.apache.org/content/repositories/releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+</repository>
</repositories>
<pluginRepositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
