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/23 20:57:30 UTC
svn commit: r1553196 [2/2] - in /jena/branches/jena-fuseki-new-ui: ./ bin/
pages/admin/ src-dev/dev/ src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/ src/main/java/org/apache/j...
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=1553196&r1=1553195&r2=1553196&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 Mon Dec 23 19:57:29 2013
@@ -23,7 +23,6 @@ import java.io.FileWriter ;
import java.io.IOException ;
import java.net.URI ;
import java.net.URISyntaxException ;
-import java.util.Collection ;
import java.util.HashMap ;
import java.util.Map ;
@@ -33,9 +32,6 @@ import org.apache.jena.atlas.web.auth.Pr
import org.apache.jena.atlas.web.auth.ScopedAuthenticator ;
import org.apache.jena.atlas.web.auth.ServiceAuthenticator ;
import org.apache.jena.atlas.web.auth.SimpleAuthenticator ;
-import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.apache.jena.fuseki.server.SPARQLServer ;
-import org.apache.jena.fuseki.server.ServerConfig ;
import org.junit.AfterClass ;
import org.junit.Assert ;
import org.junit.BeforeClass ;
@@ -46,8 +42,6 @@ import com.hp.hpl.jena.query.DatasetAcce
import com.hp.hpl.jena.query.DatasetAccessorFactory ;
import com.hp.hpl.jena.query.QueryExecutionFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP ;
import com.hp.hpl.jena.sparql.engine.http.QueryExceptionHTTP ;
import com.hp.hpl.jena.sparql.engine.http.Service ;
@@ -63,7 +57,6 @@ import com.hp.hpl.jena.update.UpdateRequ
public class TestAuth extends ServerTest {
private static File realmFile;
- private static SPARQLServer server;
/**
* Sets up the authentication for tests
@@ -82,16 +75,7 @@ public class TestAuth extends ServerTest
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
- ServerConfig conf = ServerTest.make(dsg, true, true);
- conf.port = ServerTest.port;
- conf.pagesPort = ServerTest.port;
- conf.authConfigFile = realmFile.getAbsolutePath();
-
- server = new SPARQLServer(conf);
- X_Config.configureDatasets(conf.datasets) ;
- server.start();
+ ServerTest.setupServer(realmFile.getAbsolutePath());
}
/**
@@ -99,10 +83,7 @@ public class TestAuth extends ServerTest
*/
@AfterClass
public static void teardown() {
- server.stop();
- Collection<String> keys = DatasetRegistry.get().keys() ;
- for ( String k : keys )
- DatasetRegistry.get().remove(k);
+ ServerTest.teardownServer();
realmFile.delete();
}
Modified: jena/branches/jena-fuseki-new-ui/war-web.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/war-web.xml?rev=1553196&r1=1553195&r2=1553196&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/war-web.xml (original)
+++ jena/branches/jena-fuseki-new-ui/war-web.xml Mon Dec 23 19:57:29 2013
@@ -8,16 +8,16 @@
<display-name>Apache Jena Fuseki Server</display-name>
<listener>
- <listener-class>webapp.ServerInit</listener-class>
+ <listener-class>org.apache.jena.fuseki.server.FusekiServletContextListener</listener-class>
</listener>
<filter>
- <filter-name>FusekiFilter</filter-name>
- <filter-class>org.apache.jena.fuseki.servlets.SPARQ_UberFilter</filter-class>
+ <filter-name>Fuseki</filter-name>
+ <filter-class>org.apache.jena.fuseki.servlets.FusekiFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>FusekiFilter</filter-name>
+ <filter-name>Fuseki</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
@@ -25,23 +25,103 @@
<dispatcher>ERROR</dispatcher>
</filter-mapping>
+ <!-- Validators -->
<servlet>
- <servlet-name>FusekiServlet</servlet-name>
- <servlet-class>webapp.FusekiServlet</servlet-class>
+ <servlet-name>QueryValidator</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.validation.QueryValidator</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>UpdateValidator</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.validation.UpdateValidator</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>DataValidator</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.validation.DataValidator</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>IRIValidator</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.validation.IRIValidator</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>QueryValidator</servlet-name>
+ <url-pattern>/validate/query</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
- <servlet-name>FusekiServlet</servlet-name>
- <url-pattern>/</url-pattern>
+ <servlet-name>UpdateValidator</servlet-name>
+ <url-pattern>/validate/update</url-pattern>
</servlet-mapping>
- <!-- pages -->
+ <servlet-mapping>
+ <servlet-name>IRIValidator</servlet-name>
+ <url-pattern>/validate/iri</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>DataValidator</servlet-name>
+ <url-pattern>/validate/data</url-pattern>
+ </servlet-mapping>
+
+ <!-- Admin controls-->
+
+ <servlet>
+ <servlet-name>DumpServlet</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.mgt.DumpServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>StatusServlet</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionDescription</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PingServlet</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionPing</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>DumpServlet</servlet-name>
+ <url-pattern>/$/dump</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>StatusServlet</servlet-name>
+ <url-pattern>/$/status</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>PingServlet</servlet-name>
+ <url-pattern>/$/ping</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ActionStats</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionStats</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ActionDatasets</servlet-name>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionDatasets</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ActionStats</servlet-name>
+ <url-pattern>/$/stats/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ActionDatasets</servlet-name>
+ <url-pattern>/$/datasets/*</url-pattern>
+ </servlet-mapping>
- <!--
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
- -->
+
<mime-mapping>
<extension>rdf</extension>
<mime-type>application/rdf+xml;charset=utf-8</mime-type>