You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/04/02 16:58:21 UTC
svn commit: r1308373 - in /incubator/jena/Jena2/Fuseki/trunk: ./
src/main/java/org/apache/jena/fuseki/server/
src/main/java/org/apache/jena/fuseki/servlets/
src/main/java/org/apache/jena/fuseki/validation/
Author: andy
Date: Mon Apr 2 14:58:20 2012
New Revision: 1308373
URL: http://svn.apache.org/viewvc?rev=1308373&view=rev
Log:
Update to latest versions of other system - convert to new IRI package location.
Modified:
incubator/jena/Jena2/Fuseki/trunk/.classpath
incubator/jena/Jena2/Fuseki/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
Modified: incubator/jena/Jena2/Fuseki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/.classpath?rev=1308373&r1=1308372&r2=1308373&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/.classpath (original)
+++ incubator/jena/Jena2/Fuseki/trunk/.classpath Mon Apr 2 14:58:20 2012
@@ -14,10 +14,18 @@
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-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/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating/jena-tdb-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating/jena-tdb-0.9.0-incubating-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.1-incubating-SNAPSHOT/jena-arq-2.9.1-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.1-incubating-SNAPSHOT/jena-core-2.7.1-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.1-incubating-SNAPSHOT/jena-iri-0.9.1-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.1-incubating-SNAPSHOT/jena-tdb-0.9.1-incubating-SNAPSHOT.jar"
+ sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.1-incubating-SNAPSHOT/jena-tdb-0.9.1-incubating-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024-sources.jar"/>
Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1308373&r1=1308372&r2=1308373&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Mon Apr 2 14:58:20 2012
@@ -61,9 +61,9 @@
<assembly.soh.name>${this.root}</assembly.soh.name>
<assembly.zip.name>${this.root}</assembly.zip.name>
- <ver.jena>2.7.0-incubating</ver.jena>
- <ver.arq>2.9.0-incubating</ver.arq>
- <ver.tdb>0.9.0-incubating</ver.tdb>
+ <ver.jena>2.7.1-incubating-SNAPSHOT</ver.jena>
+ <ver.arq>2.9.1-incubating-SNAPSHOT</ver.arq>
+ <ver.tdb>0.9.1-incubating-SNAPSHOT</ver.tdb>
<ver.jetty>7.5.4.v20111024</ver.jetty>
<ver.velocity>1.7</ver.velocity>
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java?rev=1308373&r1=1308372&r2=1308373&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java Mon Apr 2 14:58:20 2012
@@ -19,9 +19,9 @@
package org.apache.jena.fuseki.server;
import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.iri.IRI ;
import org.openjena.riot.system.IRIResolver ;
-import com.hp.hpl.jena.iri.IRI ;
import com.hp.hpl.jena.rdf.model.Property ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.rdf.model.ResourceFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1308373&r1=1308372&r2=1308373&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Mon Apr 2 14:58:20 2012
@@ -35,13 +35,9 @@ import org.apache.jena.fuseki.FusekiLib
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
+import org.apache.jena.iri.IRI ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.riot.ContentType ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
+import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
import org.openjena.riot.system.IRIResolver ;
@@ -49,7 +45,6 @@ import org.openjena.riot.system.IRIResol
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.iri.IRI ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
public class SPARQL_Upload extends SPARQL_ServletBase
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java?rev=1308373&r1=1308372&r2=1308373&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java Mon Apr 2 14:58:20 2012
@@ -26,12 +26,11 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.iri.IRI ;
+import org.apache.jena.iri.IRIFactory ;
+import org.apache.jena.iri.Violation ;
import org.openjena.riot.system.IRIResolver ;
-import com.hp.hpl.jena.iri.IRI ;
-import com.hp.hpl.jena.iri.IRIFactory ;
-import com.hp.hpl.jena.iri.Violation ;
-
public class IRIValidator extends ValidatorBase
{
public IRIValidator()
@@ -45,7 +44,6 @@ public class IRIValidator extends Valida
protected void execute(HttpServletRequest httpRequest, HttpServletResponse httpResponse)
{
try {
-
String[] args = httpRequest.getParameterValues(paramIRI) ;
ServletOutputStream outStream = httpResponse.getOutputStream() ;
PrintStream stdout = System.out ;