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 2013/12/16 22:37:30 UTC
svn commit: r1551363 - in /jena:
branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/
trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/
trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/
trunk/jena-arq/src/test/java/org/ap...
Author: andy
Date: Mon Dec 16 21:37:30 2013
New Revision: 1551363
URL: http://svn.apache.org/r1551363
Log:
JENA-611 : Add LocatorFTP
(RIOT version) LocatorURL becomes an abstract class for LocatorHTTP and LocatorFTP.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFTP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorHTTP.java
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java Mon Dec 16 21:37:30 2013
@@ -20,7 +20,8 @@ package org.apache.jena.fuseki ;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.riot.RIOT ;
-import org.apache.jena.riot.stream.LocatorURL ;
+import org.apache.jena.riot.stream.LocatorFTP ;
+import org.apache.jena.riot.stream.LocatorHTTP ;
import org.apache.jena.riot.stream.StreamManager ;
import org.eclipse.jetty.server.Server ;
import org.slf4j.Logger ;
@@ -145,7 +146,8 @@ public class Fuseki {
static {
webStreamManager = new StreamManager() ;
// Only know how to handle http URLs
- webStreamManager.addLocator(new LocatorURL()) ;
+ webStreamManager.addLocator(new LocatorHTTP()) ;
+ webStreamManager.addLocator(new LocatorFTP()) ;
}
private static boolean initialized = false ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Mon Dec 16 21:37:30 2013
@@ -208,11 +208,23 @@ public class AdapterFileManager extends
/** Add a URL locator */
@Override
+ @Deprecated
public void addLocatorURL() {
- Locator loc = new LocatorURL() ;
+ Locator loc = new LocatorHTTP() ;
+ streamManager.addLocator(loc) ;
+ }
+
+ public void addLocatorHTTP() {
+ Locator loc = new LocatorHTTP() ;
streamManager.addLocator(loc) ;
}
+ public void addLocatorFTP() {
+ Locator loc = new LocatorFTP() ;
+ streamManager.addLocator(loc) ;
+ }
+
+
/** Add a zip file locator */
@Override
public void addLocatorZip(String zfn) {
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java Mon Dec 16 21:37:30 2013
@@ -61,7 +61,7 @@ class AdapterLib {
return new LocatorClassLoader(classLoc.getClassLoader()) ;
}
if ( oldloc instanceof com.hp.hpl.jena.util.LocatorURL )
- return new LocatorURL() ;
+ return new LocatorHTTP() ;
if ( oldloc instanceof com.hp.hpl.jena.util.LocatorZip ) {
com.hp.hpl.jena.util.LocatorZip zipLoc = (com.hp.hpl.jena.util.LocatorZip)oldloc ;
return new LocatorZip(zipLoc.getZipFileName()) ;
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFTP.java?rev=1551363&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFTP.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFTP.java Mon Dec 16 21:37:30 2013
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.stream ;
+
+import java.io.IOException ;
+import java.io.InputStream ;
+import java.net.MalformedURLException ;
+import java.net.URL ;
+
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+public class LocatorFTP extends LocatorURL {
+ private static Logger log = LoggerFactory.getLogger(LocatorFTP.class) ;
+ private static final String[] schemeNames = { "ftp" } ;
+
+ public LocatorFTP() {
+ super(schemeNames) ;
+ }
+
+ @Override
+ protected Logger log() { return log ; }
+
+ @Override
+ public TypedInputStream performOpen(String uri) {
+ if ( uri.startsWith("ftp://") ) {
+ try {
+ URL url = new URL(uri) ;
+ InputStream in = url.openStream() ;
+ ContentType ct = RDFLanguages.guessContentType(uri) ;
+ return new TypedInputStream(in, ct) ;
+ }
+ catch (MalformedURLException ex) {
+ throw new RiotException("Bad FTP URL: "+uri, ex) ;
+ }
+ catch (IOException ex) {
+ // This includes variations on "not found"
+ IO.exception(ex) ;
+ }
+ }
+ return null ;
+ }
+
+ @Override
+ public String getName() {
+ return "LocatorFTP" ;
+ }
+
+ @Override
+ public int hashCode() {
+ return 57 ;
+ }
+}
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorHTTP.java?rev=1551363&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorHTTP.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorHTTP.java Mon Dec 16 21:37:30 2013
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.stream ;
+
+import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+public class LocatorHTTP extends LocatorURL {
+ private static Logger log = LoggerFactory.getLogger(LocatorHTTP.class) ;
+ private static final String[] schemeNames = {"http", "https"} ;
+
+ public LocatorHTTP() {
+ super(schemeNames) ;
+ }
+
+ @Override
+ protected Logger log() { return log ; }
+
+ @Override
+ public TypedInputStream performOpen(String uri) {
+ if ( uri.startsWith("http://") || uri.startsWith("https://") )
+ return HttpOp.execHttpGet(uri, WebContent.defaultGraphAcceptHeader) ;
+ return null ;
+ }
+
+ @Override
+ public String getName() {
+ return "LocatorHTTP" ;
+ }
+
+ @Override
+ public int hashCode() {
+ return 57 ;
+ }
+}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java Mon Dec 16 21:37:30 2013
@@ -21,40 +21,33 @@ package org.apache.jena.riot.stream;
import java.util.Locale ;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.riot.WebContent ;
-import org.apache.jena.riot.web.HttpOp ;
import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.util.FileUtils ;
-public class LocatorURL implements Locator
+public abstract class LocatorURL implements Locator
{
- private static Logger log = LoggerFactory.getLogger(LocatorURL.class) ;
- private static final String[] schemeNames = { "http" , "https" } ; // Must be lower case and not include the ":"
+ private final String[] schemeNames ;
+
+ protected LocatorURL(String[] sNames) {
+ schemeNames = sNames ;
+ }
+
+ protected abstract Logger log() ;
@Override
- public TypedInputStream open(String uri)
- {
- if ( ! acceptByScheme(uri) )
- {
- if ( StreamManager.logAllLookups && log.isTraceEnabled() )
- log.trace("Not found : "+uri) ;
+ public TypedInputStream open(String uri) {
+ if ( ! acceptByScheme(uri) ) {
+ if ( StreamManager.logAllLookups && log().isTraceEnabled() )
+ log().trace("Not found : "+uri) ;
return null;
}
- if ( uri.startsWith("http://") || uri.startsWith("https://"))
- return HttpOp.execHttpGet(uri, WebContent.defaultGraphAcceptHeader) ;
- return null ;
+ return performOpen(uri) ;
}
- @Override
- public String getName()
- {
- return "LocatorURL" ;
- }
-
- private static boolean acceptByScheme(String filenameOrURI)
- {
+ protected abstract TypedInputStream performOpen(String uri) ;
+
+ protected boolean acceptByScheme(String filenameOrURI) {
String uriSchemeName = FileUtils.getScheme(filenameOrURI) ;
if ( uriSchemeName == null )
return false ;
@@ -68,14 +61,10 @@ public class LocatorURL implements Locat
}
@Override
- public int hashCode()
- {
- return 57 ;
- }
+ public abstract int hashCode() ;
@Override
- public boolean equals(Object obj)
- {
+ public boolean equals(Object obj) {
if (this == obj) return true ;
if (obj == null) return false ;
return getClass() == obj.getClass() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java Mon Dec 16 21:37:30 2013
@@ -61,13 +61,14 @@ public class StreamManager {
}
/**
- * Return a default configuration StreamManager with a {@link LocatorFile},
- * {@link LocatorURL}, and {@link LocatorClassLoader}
+ * Return a default configuration StreamManager with a {@linkplain LocatorFile},
+ * {@linkplain LocatorHTTP}, {@linkplain LocatorFTP} and {@linkplain LocatorClassLoader}
*/
public static StreamManager makeDefaultStreamManager() {
StreamManager streamManager = new StreamManager() ;
streamManager.addLocator(new LocatorFile(null)) ;
- streamManager.addLocator(new LocatorURL()) ;
+ streamManager.addLocator(new LocatorHTTP()) ;
+ streamManager.addLocator(new LocatorFTP()) ;
streamManager.addLocator(new LocatorClassLoader(streamManager.getClass().getClassLoader())) ;
streamManager.setLocationMapper(JenaIOEnvironment.getLocationMapper()) ;
return streamManager ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Mon Dec 16 21:37:30 2013
@@ -49,12 +49,12 @@ public class TestStreamManager extends B
streamMgrDir = new StreamManager() ;
// Not current directory.
streamMgrDir.addLocator(new LocatorFile(directory)) ;
- streamMgrDir.addLocator(new LocatorURL()) ;
+ streamMgrDir.addLocator(new LocatorHTTP()) ;
streamMgrHere = new StreamManager() ;
// Not current directory.
streamMgrHere.addLocator(new LocatorFile()) ;
- streamMgrHere.addLocator(new LocatorURL()) ;
+ streamMgrHere.addLocator(new LocatorHTTP()) ;
streamMgrNull = new StreamManager() ;
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1551363&r1=1551362&r2=1551363&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java Mon Dec 16 21:37:30 2013
@@ -20,7 +20,8 @@ package org.apache.jena.fuseki;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.riot.RIOT ;
-import org.apache.jena.riot.stream.LocatorURL ;
+import org.apache.jena.riot.stream.LocatorFTP ;
+import org.apache.jena.riot.stream.LocatorHTTP ;
import org.apache.jena.riot.stream.StreamManager ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -123,8 +124,9 @@ public class Fuseki
public static final StreamManager webStreamManager ;
static {
webStreamManager = new StreamManager() ;
- // Only know how to handle http URLs
- webStreamManager.addLocator(new LocatorURL()) ;
+ // Only know how to handle http and ftp URLs - nothing local.
+ webStreamManager.addLocator(new LocatorHTTP()) ;
+ webStreamManager.addLocator(new LocatorFTP()) ;
}
private static boolean initialized = false ;