You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ca...@apache.org on 2012/12/09 16:00:16 UTC
svn commit: r1418997 - in /jena/trunk/jena-larq: ./
src/main/java/org/apache/jena/larq/ src/test/java/org/apache/jena/larq/
src/test/java/org/apache/jena/larq/examples/
Author: castagna
Date: Sun Dec 9 15:00:14 2012
New Revision: 1418997
URL: http://svn.apache.org/viewvc?rev=1418997&view=rev
Log:
org.openjena.atlas --> org.apache.jena.atlas and 2.9.5-SNAPSHOT dependencies
Modified:
jena/trunk/jena-larq/.classpath
jena/trunk/jena-larq/pom.xml
jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java
jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java
jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java
jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java
Modified: jena/trunk/jena-larq/.classpath
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/.classpath?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/.classpath (original)
+++ jena/trunk/jena-larq/.classpath Sun Dec 9 15:00:14 2012
@@ -6,21 +6,22 @@
<classpathentry kind="src" path="src/main/resources" excluding="META-INF/NOTICE|META-INF/LICENSE|META-INF/DEPENDENCIES|**/*.java"/>
<classpathentry kind="src" path="target/maven-shared-archive-resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes-eclipse"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.4-SNAPSHOT/jena-core-2.7.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.4-SNAPSHOT/jena-core-2.7.4-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.4-SNAPSHOT/jena-iri-0.9.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.4-SNAPSHOT/jena-iri-0.9.4-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.5-SNAPSHOT/jena-arq-2.9.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.5-SNAPSHOT/jena-arq-2.9.5-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.5-SNAPSHOT/jena-core-2.7.5-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.5-SNAPSHOT/jena-iri-0.9.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.5-SNAPSHOT/jena-iri-0.9.5-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.2/httpclient-4.2.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.2/httpclient-4.2.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.3/httpcore-4.2.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.3/httpcore-4.2.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.6.1/lucene-core-3.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/3.6.1/lucene-core-3.6.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.4-SNAPSHOT/jena-tdb-0.9.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.4-SNAPSHOT/jena-tdb-0.9.4-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.5-SNAPSHOT/jena-arq-2.9.5-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.5-SNAPSHOT/jena-arq-2.9.5-SNAPSHOT-test-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.5-SNAPSHOT/jena-tdb-0.9.5-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.5-SNAPSHOT/jena-tdb-0.9.5-SNAPSHOT-sources.jar"/>
</classpath>
\ No newline at end of file
Modified: jena/trunk/jena-larq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/pom.xml?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/pom.xml (original)
+++ jena/trunk/jena-larq/pom.xml Sun Dec 9 15:00:14 2012
@@ -55,8 +55,8 @@
<properties>
<ver.lucene>3.6.1</ver.lucene>
- <ver.arq>2.9.4</ver.arq>
- <ver.tdb>0.9.4</ver.tdb>
+ <ver.arq>2.9.5-SNAPSHOT</ver.arq>
+ <ver.tdb>0.9.5-SNAPSHOT</ver.tdb>
</properties>
<dependencies>
Modified: jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java (original)
+++ jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/IndexLARQ.java Sun Dec 9 15:00:14 2012
@@ -33,7 +33,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
-import org.openjena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java (original)
+++ jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/LuceneSearch.java Sun Dec 9 15:00:14 2012
@@ -20,8 +20,8 @@ package org.apache.jena.larq;
import java.util.Iterator;
-import org.openjena.atlas.iterator.IteratorTruncate;
-import org.openjena.atlas.logging.Log;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.logging.Log;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.graph.Node;
Modified: jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java (original)
+++ jena/trunk/jena-larq/src/main/java/org/apache/jena/larq/ScoreTest.java Sun Dec 9 15:00:14 2012
@@ -18,7 +18,7 @@
package org.apache.jena.larq;
-import org.openjena.atlas.iterator.IteratorTruncate;
+import org.apache.jena.atlas.iterator.IteratorTruncate;
/** Class to provide the truncation limit based on hit score */
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestAssemblerLARQ.java Sun Dec 9 15:00:14 2012
@@ -37,8 +37,8 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openjena.atlas.lib.FileOps;
-import org.openjena.atlas.logging.Log;
+import org.apache.jena.atlas.lib.FileOps;
+import org.apache.jena.atlas.logging.Log;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/TestLARQUtils.java Sun Dec 9 15:00:14 2012
@@ -25,7 +25,7 @@ import org.apache.jena.larq.IndexBuilder
import org.apache.jena.larq.IndexLARQ;
import org.apache.jena.larq.LARQ;
import org.apache.lucene.index.IndexReader;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryExecution ;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene1.java Sun Dec 9 15:00:14 2012
@@ -22,7 +22,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderString;
import org.apache.jena.larq.IndexLARQ;
import org.apache.jena.larq.LARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.query.Query;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene2.java Sun Dec 9 15:00:14 2012
@@ -20,7 +20,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene3.java Sun Dec 9 15:00:14 2012
@@ -21,7 +21,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderString;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene4.java Sun Dec 9 15:00:14 2012
@@ -21,7 +21,7 @@ package org.apache.jena.larq.examples;
import org.apache.jena.larq.IndexBuilderSubject;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java?rev=1418997&r1=1418996&r2=1418997&view=diff
==============================================================================
--- jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java (original)
+++ jena/trunk/jena-larq/src/test/java/org/apache/jena/larq/examples/ExLucene5.java Sun Dec 9 15:00:14 2012
@@ -22,7 +22,7 @@ import java.io.StringReader;
import org.apache.jena.larq.IndexBuilderNode;
import org.apache.jena.larq.IndexLARQ;
-import org.openjena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.lib.StrUtils;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.rdf.model.Literal;