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/02/23 15:59:13 UTC
svn commit: r1292823 - in /incubator/jena/Jena2/Fuseki/trunk: pages/
src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/server/
Author: andy
Date: Thu Feb 23 14:59:12 2012
New Revision: 1292823
URL: http://svn.apache.org/viewvc?rev=1292823&view=rev
Log:
Static content reorg
Added:
incubator/jena/Jena2/Fuseki/trunk/pages/
- copied from r1292224, incubator/jena/Jena2/Fuseki/trunk/pages-update/
incubator/jena/Jena2/Fuseki/trunk/pages/control-panel.tpl
- copied unchanged from r1292731, incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl
incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl
- copied unchanged from r1292731, incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1292823&r1=1292822&r2=1292823&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java Thu Feb 23 14:59:12 2012
@@ -41,8 +41,7 @@ public class Fuseki
static public String FusekiHomeEnv = "FUSEKI_HOME" ;
static public String FusekiSymbolIRI = "http://jena.apache.org/fuseki#" ;
- static public String PagesPublish = "pages-publish" ;
- static public String PagesAll = "pages-update" ;
+ static public String PagesStatic = "pages" ;
//static private String metadataDevLocation = "org/openjena/fuseki/fuseki-properties-dev.xml" ;
static private String metadataLocation = "org/apache/jena/fuseki/fuseki-properties.xml" ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1292823&r1=1292822&r2=1292823&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Thu Feb 23 14:59:12 2012
@@ -344,7 +344,7 @@ public class FusekiCmd extends CmdARQ
String staticContentDir = pagesDir ;
if ( staticContentDir == null )
- staticContentDir = homeDir+Fuseki.PagesAll ;
+ staticContentDir = homeDir+Fuseki.PagesStatic ;
if ( ! FileOps.exists(staticContentDir) )
Fuseki.configLog.warn("No such directory for static content: "+staticContentDir) ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1292823&r1=1292822&r2=1292823&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Thu Feb 23 14:59:12 2012
@@ -110,7 +110,7 @@ public class FusekiConfig
config.mgtPort = 3031 ;
config.pagesPort = config.port ;
config.jettyConfigFile = null ;
- config.pages = "Pages-Update" ;
+ config.pages = Fuseki.PagesStatic ;
config.enableCompression = true ;
return config ;
}