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 2015/03/05 14:26:26 UTC
[1/2] jena git commit: Skip potential "log4j.properties" if they look
like test resources.
Repository: jena
Updated Branches:
refs/heads/master feb04a10f -> acbbdd636
Skip potential "log4j.properties" if they look like test resources.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ad52df4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ad52df4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ad52df4
Branch: refs/heads/master
Commit: 0ad52df463faa574d82d11f5538389766d535a94
Parents: feb04a1
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 5 13:11:25 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 5 13:11:25 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/FusekiLogging.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0ad52df4/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
index 1add2b2..003b38d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
@@ -43,7 +43,8 @@ public class FusekiLogging
// 5/ Use Built in string
/** Places for the log4j properties file at (3) */
- private static final String[] resourcesForLog4jProperties = {
+ private static final String[] resourcesForLog4jProperties = {
+ // Hmm -
"log4j.properties",
"org/apache/jena/fuseki/log4j.properties"
} ;
@@ -88,6 +89,12 @@ public class FusekiLogging
logLogging("Fuseki logging - classpath %s", resourceName) ;
URL url = Loader.getResource(resourceName) ;
if ( url != null ) {
+ // Problem - test classes can be on the classpath (development mainly).
+ if ( url.toString().contains("-tests.jar") || url.toString().contains("test-classes") )
+ url = null ;
+ }
+
+ if ( url != null ) {
PropertyConfigurator.configure(url) ;
logLogging("Fuseki logging - found via classpath %s", url) ;
System.setProperty("log4j.configuration", url.toString()) ;
[2/2] jena git commit: JENA-894 : Use a backup file within the server
runtime area.
Posted by an...@apache.org.
JENA-894 : Use a backup file within the server runtime area.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/acbbdd63
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/acbbdd63
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/acbbdd63
Branch: refs/heads/master
Commit: acbbdd636873ccdeb7180e206d190613d1876417
Parents: 0ad52df
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 5 13:12:42 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 5 13:12:42 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/mgt/Backup.java | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/acbbdd63/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
index 1b1d823..66aa4c4 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/Backup.java
@@ -24,10 +24,10 @@ import java.util.Set ;
import java.util.zip.GZIPOutputStream ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.server.FusekiServer ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
@@ -37,14 +37,20 @@ import com.hp.hpl.jena.sparql.util.Utils ;
/** Perform a backup */
public class Backup
{
- public static final String BackupArea = "backups" ;
-
public static String chooseFileName(String dsName) {
- FileOps.ensureDir(BackupArea) ;
- final String ds = dsName.startsWith("/") ? dsName : "/" + dsName ;
-
+ // Without the "/" - ie. a relative name.
+ String ds = dsName ;
+ if ( ds.startsWith("/") )
+ ds = ds.substring(1) ;
+ if ( ds.contains("/") ) {
+ Fuseki.adminLog.warn("Dataset name: werid format: "+dsName) ;
+ // Some kind of fixup
+ ds = ds.replace("/", "_") ;
+ }
+
String timestamp = Utils.nowAsString("yyyy-MM-dd_HH-mm-ss") ;
- final String filename = BackupArea + ds + "_" + timestamp ;
+ String filename = ds + "_" + timestamp ;
+ filename = FusekiServer.dirBackups.resolve(filename).toString() ;
return filename ;
}