Author: andy
Date: Sun Dec 15 17:45:31 2013
New Revision: 1551033
URL: http://svn.apache.org/r1551033
Log:
Align to ARQ logging changes
Added:
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestFileUpload.java
Modified:
jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAuth.java
Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Sun Dec 15
17:45:31 2013
@@ -22,7 +22,7 @@ public class PROJECT {
// Andy's ToDo list
// All TODO and XXX
// Graph upload in ActionDatasets == Upload.
- // REST_Quads
+
// Remove all direct naming (put in separate servlet if ever needed)
// last place : SPARQL_UberServlet
@@ -33,5 +33,7 @@ public class PROJECT {
// WEB.xml
// ContextPath in uber dispatch.
// FusekiServletContextListener
+
+ // SPARQLServer.start kicks FusekiServletContextListener which could then
do the main initialization.
}
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
Sun Dec 15 17:45:31 2013
@@ -28,7 +28,7 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.fuseki.mgt.ManagementServer ;
import org.apache.jena.fuseki.server.FusekiConfig ;
import org.apache.jena.fuseki.server.SPARQLServer ;
@@ -111,7 +111,7 @@ public class FusekiCmd extends CmdARQ {
return ;
}
// Use built-in for Fuseki.
- Log.resetLogging(log4Jsetup) ;
+ LogCtl.resetLogging(log4Jsetup) ;
}
static {
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
Sun Dec 15 17:45:31 2013
@@ -65,8 +65,8 @@ public class FusekiServletContextListene
{
if ( initialized )
return ;
+ initialized = true ;
Fuseki.init() ;
- confLog.error("Unconverted code - need to find configuration");
}
}
}
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
Sun Dec 15 17:45:31 2013
@@ -163,7 +163,7 @@ public abstract class SPARQL_UberServlet
if ( ct != null )
mt = MediaType.create(ct, charset) ;
- action.log.info(format("[%d] All: %s %s :: '%s' :: %s ? %s", id,
method, desc.name, trailing, (mt==null?"<none>":mt), (qs==null?"":qs))) ;
+ action.log.info(format("[%d] %s %s :: '%s' :: %s ? %s", id, method,
desc.name, trailing, (mt==null?"<none>":mt), (qs==null?"":qs))) ;
boolean hasTrailing = ( trailing.length() != 0 ) ;
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
Sun Dec 15 17:45:31 2013
@@ -42,8 +42,7 @@ public class Upload {
public static void incomingData(HttpAction action, StreamRDF dest, boolean
isGraph) {
ContentType ct = FusekiLib.getContentType(action) ;
- if (
WebContent.contentTypeMultiFormData.equalsIgnoreCase(ct.getContentType()) )
- {
+ if (
WebContent.contentTypeMultiFormData.equalsIgnoreCase(ct.getContentType()) ) {
fileUploadWorker(action, dest, isGraph) ;
return ;
}
@@ -79,7 +78,7 @@ public class Upload {
public static void fileUploadWorker(HttpAction action, StreamRDF dest,
boolean isGraph) {
String base = ActionLib.wholeRequestURL(action.request) ;
- String item = (isGraph)?"quad":"triple" ;
+ String item = (isGraph)?"triple":"quad" ;
ServletFileUpload upload = new ServletFileUpload();
long count = -1 ;
@@ -137,7 +136,7 @@ public class Upload {
}
}
catch (ActionErrorException ex) { throw ex ; }
- catch (Exception ex) { ServletOps.errorOccurred(ex) ; }
+ catch (Exception ex) {
ServletOps.errorOccurred(ex.getMessage()) ; }
}
}
Modified:
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
Sun Dec 15 17:45:31 2013
@@ -56,7 +56,7 @@ public class ServerTest
public static final String datasetPath = "/dataset" ;
public static final String serviceUpdate =
"http://localhost:"+port+datasetPath+"/update"; ;
public static final String serviceQuery =
"http://localhost:"+port+datasetPath+"/query"; ;
- public static final String serviceREST =
"http://localhost:"+port+datasetPath+"/data"; ; // ??????
+ public static final String serviceREST =
"http://localhost:"+port+datasetPath+"/data"; ;
public static final String gn1 = "http://graph/1"; ;
public static final String gn2 = "http://graph/2"; ;
Modified:
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
Sun Dec 15 17:45:31 2013
@@ -19,7 +19,7 @@
package org.apache.jena.fuseki;
import org.apache.http.client.HttpClient ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ;
import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ;
import org.apache.jena.fuseki.http.TestHttpOp ;
@@ -57,6 +57,6 @@ public class TS_Fuseki extends ServerTes
HttpOp.setDefaultHttpClient(defaultHttpClient) ;
}
- @BeforeClass static public void beforeClass() {
Log.disable(Fuseki.requestLogName) ; }
- @AfterClass static public void afterClass() {
Log.setInfo(Fuseki.requestLogName) ;}
+ @BeforeClass static public void beforeClass() {
LogCtl.disable(Fuseki.requestLogName) ; }
+ @AfterClass static public void afterClass() {
LogCtl.setInfo(Fuseki.requestLogName) ;}
}
Modified:
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAuth.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAuth.java?rev=1551033&r1=1551032&r2=1551033&view=diff
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAuth.java
(original)
+++
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAuth.java
Sun Dec 15 17:45:31 2013
@@ -26,7 +26,7 @@ import java.net.URISyntaxException ;
import java.util.HashMap ;
import java.util.Map ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.atlas.web.HttpException ;
import org.apache.jena.atlas.web.auth.PreemptiveBasicAuthenticator ;
import org.apache.jena.atlas.web.auth.ScopedAuthenticator ;
@@ -77,9 +77,9 @@ public class TestAuth extends ServerTest
writer.write("forbidden: password, other");
writer.close();
- Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING);
- Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING);
- Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING);
+ LogCtl.logLevel(Fuseki.serverLog.getName(),
org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING);
+ LogCtl.logLevel(Fuseki.requestLog.getName(),
org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING);
+ LogCtl.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING);
DatasetGraph dsg = DatasetGraphFactory.createMem();
// This must agree with ServerTest
Added:
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestFileUpload.java
URL:
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestFileUpload.java?rev=1551033&view=auto
==============================================================================
---
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestFileUpload.java
(added)
+++
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestFileUpload.java
Sun Dec 15 17:45:31 2013
@@ -0,0 +1,67 @@
+/*
+ * 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.fuseki;
+
+import static org.apache.jena.fuseki.ServerTest.serviceREST ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.query.DatasetAccessor ;
+import com.hp.hpl.jena.query.DatasetAccessorFactory ;
+import com.hp.hpl.jena.rdf.model.Model ;
+
+public class TestFileUpload extends BaseTest
+{
+ @BeforeClass
+ public static void beforeClass() {
+ ServerTest.allocServer() ;
+ //ServerTest.resetServer() ;
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ ServerTest.freeServer() ;
+ }
+
+ @Test public void upload_01()
+ {
+ FileSender x = new FileSender(ServerTest.serviceREST+"?default") ;
+ x.add("D.ttl", "<http://example/s> <http://example/p>
<http://example/o> .", "text/turtle") ;
+ x.send("POST") ;
+
+ DatasetAccessor du = DatasetAccessorFactory.createHTTP(serviceREST) ;
+ Model m = du.getModel() ;
+ assertEquals(1, m.size()) ;
+ }
+
+ @Test public void upload_02()
+ {
+ FileSender x = new FileSender(ServerTest.serviceREST+"?default") ;
+ x.add("D.ttl", "<http://example/s> <http://example/p> 123 .",
"text/turtle") ;
+ x.add("D.nt", "<http://example/s> <http://example/p>
<http://example/o-456> .", "application/n-triples") ;
+ x.send("PUT") ;
+
+ DatasetAccessor du = DatasetAccessorFactory.createHTTP(serviceREST) ;
+ Model m = du.getModel() ;
+ assertEquals(2, m.size()) ;
+ }
+
+}
