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 2018/08/31 12:04:55 UTC
[05/27] jena git commit: JENA-1585: Refactoring webapp code to
separate from the core server.
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
index 48e49e8..b9f1ff1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
@@ -185,12 +185,12 @@
<servlet>
<servlet-name>ActionBackup</servlet-name>
- <servlet-class>org.apache.jena.fuseki.ctl.ActionBackup</servlet-class>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionBackup</servlet-class>
</servlet>
<servlet>
<servlet-name>BackupListServlet</servlet-name>
- <servlet-class>org.apache.jena.fuseki.ctl.ActionBackupList</servlet-class>
+ <servlet-class>org.apache.jena.fuseki.mgt.ActionBackupList</servlet-class>
</servlet>
<!-- An action that only creates a background task that sleeps. -->
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/controllers/.svnkeep
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/controllers/.svnkeep b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/controllers/.svnkeep
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/layouts/.svnkeep
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/layouts/.svnkeep b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/layouts/.svnkeep
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/routers/.svnkeep
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/routers/.svnkeep b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/routers/.svnkeep
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/.svnkeep
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/.svnkeep b/jena-fuseki2/jena-fuseki-core/src/main/webapp/js/app/views/.svnkeep
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerCtl.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerCtl.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerCtl.java
index 048ecf0..8fc4513 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerCtl.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerCtl.java
@@ -30,7 +30,7 @@ import org.apache.http.client.HttpClient ;
import org.apache.http.impl.client.CloseableHttpClient ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.fuseki.jetty.JettyFuseki ;
+import org.apache.jena.fuseki.cmd.JettyFuseki;
import org.apache.jena.fuseki.jetty.JettyServerConfig ;
import org.apache.jena.fuseki.server.* ;
import org.apache.jena.fuseki.webapp.FusekiEnv;
http://git-wip-us.apache.org/repos/asf/jena/blob/06f59125/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
index cf9e192..8ce0947 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
@@ -18,11 +18,11 @@
package org.apache.jena.fuseki;
-import static org.apache.jena.fuseki.mgt.MgtConst.opDatasets ;
-import static org.apache.jena.fuseki.mgt.MgtConst.opListBackups ;
-import static org.apache.jena.fuseki.mgt.MgtConst.opPing ;
-import static org.apache.jena.fuseki.mgt.MgtConst.opServer ;
-import static org.apache.jena.fuseki.mgt.MgtConst.opStats ;
+import static org.apache.jena.fuseki.mgt.ServerMgtConst.opDatasets ;
+import static org.apache.jena.fuseki.mgt.ServerMgtConst.opListBackups ;
+import static org.apache.jena.fuseki.mgt.ServerMgtConst.opServer ;
+import static org.apache.jena.fuseki.server.ServerConst.opPing;
+import static org.apache.jena.fuseki.server.ServerConst.opStats;
import static org.apache.jena.riot.web.HttpOp.execHttpDelete ;
import static org.apache.jena.riot.web.HttpOp.execHttpGet ;
import static org.apache.jena.riot.web.HttpOp.execHttpPost ;
@@ -41,7 +41,8 @@ import org.apache.jena.atlas.json.JsonValue ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.web.HttpException ;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.fuseki.mgt.MgtConst;
+import org.apache.jena.fuseki.mgt.ServerMgtConst;
+import org.apache.jena.fuseki.server.ServerConst;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.riot.web.HttpResponseHandler ;
@@ -71,9 +72,9 @@ public class TestAdmin extends AbstractFusekiTest {
JsonValue jv = httpGetJson(ServerCtl.urlRoot()+"$/"+opServer) ;
JsonObject obj = jv.getAsObject() ;
// Now optional : assertTrue(obj.hasKey(JsonConst.admin)) ;
- assertTrue(obj.hasKey(MgtConst.datasets)) ;
- assertTrue(obj.hasKey(MgtConst.uptime)) ;
- assertTrue(obj.hasKey(MgtConst.startDT)) ;
+ assertTrue(obj.hasKey(ServerConst.datasets)) ;
+ assertTrue(obj.hasKey(ServerMgtConst.uptime)) ;
+ assertTrue(obj.hasKey(ServerMgtConst.startDT)) ;
}
@Test public void server_2() {