Author: andy
Date: Wed Jul 23 13:48:13 2014
New Revision: 1612834
URL: http://svn.apache.org/r1612834
Log:
Minor
Modified:
jena/Experimental/jena-fuseki2/docs/fuseki-layout.md
jena/Experimental/jena-fuseki2/pom.xml
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
Modified: jena/Experimental/jena-fuseki2/docs/fuseki-layout.md
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/docs/fuseki-layout.md?rev=1612834&r1=1612833&r2=1612834&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/docs/fuseki-layout.md (original)
+++ jena/Experimental/jena-fuseki2/docs/fuseki-layout.md Wed Jul 23 13:48:13
2014
@@ -22,11 +22,11 @@ everything is in the WAR file itself.
| Webapp | `FUSEKI_HOME` | N/A (Files in the Fuseki .war file) |
| | `FUSEKI_BASE` | `/etc/fuseki` |
| Standalone | `FUSEKI_HOME` | Current directory |
-| | `FUSEKI_BASE` | `${FUSEKI_HOME}run/` |
+| | `FUSEKI_BASE` | `${FUSEKI_HOME}/run/` |
When run in a web application container (e.g.
[Tomcat](http://http://tomcat.apache.org/),
[Jetty](http://eclipse.org/jetty/) or other webapp compliant server),
-`FUSEKI_HOME` will be `/etc/fuseki`.
+`FUSEKI_BASE` will be `/etc/fuseki`.
If `FUSEKI_BASE` is the same as `FUSEKI_HOME`, be careful when upgrading not
to delete
server deployment files and directories.
Modified: jena/Experimental/jena-fuseki2/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/pom.xml?rev=1612834&r1=1612833&r2=1612834&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/pom.xml (original)
+++ jena/Experimental/jena-fuseki2/pom.xml Wed Jul 23 13:48:13 2014
@@ -21,6 +21,7 @@
<name>Apache Jena - Fuseki (SPARQL 1.1 Server)</name>
<artifactId>jena-fuseki2</artifactId>
+ <version>2.0.0.M3-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
@@ -33,7 +34,6 @@
The war:war goal is added to the package phase.
-->
<packaging>jar</packaging>
- <version>2.0.0.M2-SNAPSHOT</version>
<description>Fuseki is a SPARQL 1.1 Server which provides query, update and
graph store protocol endpoints that can be used to expose triple stores over
HTTP</description>
<url>http://jena.apache.org/</url>
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java?rev=1612834&r1=1612833&r2=1612834&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
Wed Jul 23 13:48:13 2014
@@ -79,7 +79,6 @@ public class FusekiServer
private static final String systemFileAreaBase =
"system_files" ;
private static final String templatesNameBase = "templates" ;
private static final String DFT_SHIRO_INI = "shiro.ini"
; // This name is in web.xml as well.
-
// --- Set during server initialization