Refactoring due to upstream jena-arq/jena-base preparation
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/692118f9 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/692118f9 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/692118f9 Branch: refs/heads/master Commit: 692118f9d237aeb489b2ef58dade753c33b499e4 Parents: bac746d Author: Andy Seaborne <[email protected]> Authored: Tue Apr 28 21:24:12 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Apr 28 21:30:17 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/jena/fuseki/mgt/ActionBackup.java | 4 ++-- .../main/java/org/apache/jena/fuseki/mgt/PingServlet.java | 4 ++-- .../java/org/apache/jena/fuseki/server/SPARQLServer.java | 6 +++--- .../src/main/java/org/apache/jena/fuseki/Fuseki.java | 4 ++-- .../main/java/org/apache/jena/fuseki/async/AsyncTask.java | 6 +++--- .../java/org/apache/jena/fuseki/jetty/JettyFuseki.java | 8 ++++---- .../main/java/org/apache/jena/fuseki/mgt/ActionPing.java | 4 ++-- .../src/main/java/org/apache/jena/fuseki/mgt/Backup.java | 4 ++-- .../main/java/org/apache/jena/tdb/solver/stats/Stats.java | 4 ++-- .../org/apache/jena/tdb/store/bulkloader/BulkLoader.java | 10 +++++----- .../org/apache/jena/tdb/store/bulkloader/LoadMonitor.java | 4 ++-- .../apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java | 5 ++--- .../jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java | 8 +++----- jena-tdb/src/main/java/tdb/tdbconfig.java | 4 ++-- 14 files changed, 36 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java index 47d10f2..c4bdcc6 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest ; import javax.servlet.http.HttpServletResponse ; import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.FileOps ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.fuseki.FusekiException ; @@ -41,7 +42,6 @@ import org.apache.jena.fuseki.servlets.ServletBase ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFDataMgr ; import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.web.HttpSC ; public class ActionBackup extends ServletBase @@ -89,7 +89,7 @@ public class ActionBackup extends ServletBase String dsName = action.dsRef.name ; final String ds = dsName.startsWith("/")? dsName : "/"+dsName ; - String timestamp = Utils.nowAsString("yyyy-MM-dd_HH-mm-ss") ; + String timestamp = DateTimeUtils.nowAsString("yyyy-MM-dd_HH-mm-ss") ; final String filename = BackupArea + ds + "_" + timestamp ; FileOps.ensureDir(BackupArea) ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/PingServlet.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/PingServlet.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/PingServlet.java index f57e851..863da9c 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/PingServlet.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/PingServlet.java @@ -28,9 +28,9 @@ import javax.servlet.http.HttpServlet ; import javax.servlet.http.HttpServletRequest ; import javax.servlet.http.HttpServletResponse ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.riot.web.HttpNames ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.web.HttpSC ; /** @@ -64,7 +64,7 @@ public class PingServlet extends HttpServlet response.setCharacterEncoding(charsetUTF8) ; response.setStatus(HttpSC.OK_200); ServletOutputStream out = response.getOutputStream() ; - out.println(Utils.nowAsXSDDateTimeString()); + out.println(DateTimeUtils.nowAsXSDDateTimeString()); } catch (IOException ex) { Fuseki.serverLog.warn("ping :: IOException :: "+ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java index ec70912..fe71cbf 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java @@ -27,6 +27,7 @@ import java.util.* ; import javax.servlet.DispatcherType ; import javax.servlet.http.HttpServlet ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.FileOps ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.FusekiException ; @@ -41,7 +42,6 @@ import org.apache.jena.fuseki.validation.QueryValidator ; import org.apache.jena.fuseki.validation.UpdateValidator ; import org.apache.jena.riot.WebContent ; import org.apache.jena.sparql.mgt.ARQMgt ; -import org.apache.jena.sparql.util.Utils ; import org.eclipse.jetty.http.MimeTypes ; import org.eclipse.jetty.security.* ; import org.eclipse.jetty.security.authentication.BasicAuthenticator ; @@ -105,7 +105,7 @@ public class SPARQLServer { * Initialize the {@link SPARQLServer} instance. */ public void start() { - String now = Utils.nowAsString() ; + String now = DateTimeUtils.nowAsString() ; serverLog.info(format("%s %s %s", Fuseki.NAME, Fuseki.VERSION, Fuseki.BUILD_DATE)) ; // This does not get set usefully for Jetty as we use it. // String jettyVersion = org.eclipse.jetty.server.Server.getVersion() ; @@ -132,7 +132,7 @@ public class SPARQLServer { * Stop the {@link SPARQLServer} instance. */ public void stop() { - String now = Utils.nowAsString() ; + String now = DateTimeUtils.nowAsString() ; serverLog.info(format("Stopped %s on port %d", now, server.getConnectors()[0].getPort())) ; try { server.stop() ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java index 9b07837..c542d87 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java @@ -22,6 +22,7 @@ import java.util.Calendar ; import java.util.TimeZone ; import java.util.concurrent.TimeUnit ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.query.ARQ ; import org.apache.jena.riot.RIOT ; import org.apache.jena.riot.system.stream.LocatorFTP ; @@ -32,7 +33,6 @@ import org.apache.jena.sparql.lib.Metadata ; import org.apache.jena.sparql.mgt.SystemInfo ; import org.apache.jena.sparql.util.Context ; import org.apache.jena.sparql.util.MappingRegistry ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDB ; import org.apache.jena.tdb.transaction.TransactionManager ; import org.slf4j.Logger ; @@ -170,7 +170,7 @@ public class Fuseki { private static final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("00:00")) ; static { cal.setTimeInMillis(startMillis) ; } // Exactly the same start point! - private static final String startDateTime = Utils.calendarToXSDDateTimeString(cal) ; + private static final String startDateTime = DateTimeUtils.calendarToXSDDateTimeString(cal) ; /** Return the number of milliseconds since the server started */ public static long serverUptimeMillis() { http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java index 2a509bd..6ddd1bd 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncTask.java @@ -22,11 +22,11 @@ import static java.lang.String.format ; import java.util.concurrent.Callable ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.InternalErrorException ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.server.DataService ; -import org.apache.jena.sparql.util.Utils ; import org.slf4j.Logger ; /** An asynchronous task */ @@ -73,7 +73,7 @@ public class AsyncTask implements Callable<Object> } Fuseki.serverLog.info(format("[Task %s] starts : %s",taskId, displayName)) ; - startPoint = Utils.nowAsXSDDateTimeString() ; + startPoint = DateTimeUtils.nowAsXSDDateTimeString() ; } public void finish() { @@ -82,7 +82,7 @@ public class AsyncTask implements Callable<Object> Log.warn(Fuseki.serverLog, msg) ; throw new InternalErrorException("Finish has already been called ["+getTaskId()+"]") ; } - finishPoint = Utils.nowAsXSDDateTimeString() ; + finishPoint = DateTimeUtils.nowAsXSDDateTimeString() ; Fuseki.serverLog.info(format("[Task %s] finishes : %s",taskId, displayName)) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java index d6bc69f..8b67693 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java @@ -23,12 +23,12 @@ import static org.apache.jena.fuseki.Fuseki.serverLog ; import java.io.FileInputStream ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.FileOps ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.FusekiException ; import org.apache.jena.fuseki.mgt.MgtJMX ; import org.apache.jena.fuseki.server.FusekiEnv ; -import org.apache.jena.sparql.util.Utils ; import org.eclipse.jetty.security.* ; import org.eclipse.jetty.security.authentication.BasicAuthenticator ; import org.eclipse.jetty.server.* ; @@ -104,7 +104,7 @@ public class JettyFuseki { if ( version != null && version.equals("${project.version}") ) version = null ; if ( buildDate != null && buildDate.equals("${build.time.xsd}") ) - buildDate = Utils.nowAsXSDDateTimeString() ; + buildDate = DateTimeUtils.nowAsXSDDateTimeString() ; if ( version != null && buildDate != null ) serverLog.info(format("%s %s %s", Fuseki.NAME, version, buildDate)) ; @@ -125,7 +125,7 @@ public class JettyFuseki { serverLog.error("SPARQLServer: Failed to start server: " + ex.getMessage(), ex) ; System.exit(1) ; } - String now = Utils.nowAsString() ; + String now = DateTimeUtils.nowAsString() ; serverLog.info(format("Started %s on port %d", now, serverConnector.getPort())) ; } @@ -143,7 +143,7 @@ public class JettyFuseki { * Stop the {@link JettyFuseki} instance. */ public void stop() { - String now = Utils.nowAsString() ; + String now = DateTimeUtils.nowAsString() ; serverLog.info(format("Stopped %s on port %d", now, serverConnector.getPort())) ; try { server.stop() ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java index 7694247..5191855 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java @@ -28,9 +28,9 @@ import javax.servlet.http.HttpServlet ; import javax.servlet.http.HttpServletRequest ; import javax.servlet.http.HttpServletResponse ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.servlets.ServletOps ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.web.HttpSC ; /** The ping servlet provides a low costy, uncached endpoint that can be used @@ -67,7 +67,7 @@ public class ActionPing extends HttpServlet response.setCharacterEncoding(charsetUTF8) ; response.setStatus(HttpSC.OK_200); ServletOutputStream out = response.getOutputStream() ; - out.println(Utils.nowAsXSDDateTimeString()); + out.println(DateTimeUtils.nowAsXSDDateTimeString()); } catch (IOException ex) { Fuseki.serverLog.warn("ping :: IOException :: "+ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/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 b8b4f67..e9a1fca 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,6 +24,7 @@ import java.util.Set ; import java.util.zip.GZIPOutputStream ; import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.FusekiException ; @@ -34,7 +35,6 @@ import org.apache.jena.riot.RDFDataMgr ; import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.core.Transactional ; import org.apache.jena.sparql.core.TransactionalNull ; -import org.apache.jena.sparql.util.Utils ; /** Perform a backup */ public class Backup @@ -50,7 +50,7 @@ public class Backup ds = ds.replace("/", "_") ; } - String timestamp = Utils.nowAsString("yyyy-MM-dd_HH-mm-ss") ; + String timestamp = DateTimeUtils.nowAsString("yyyy-MM-dd_HH-mm-ss") ; String filename = ds + "_" + timestamp ; filename = FusekiServer.dirBackups.resolve(filename).toString() ; return filename ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/org/apache/jena/tdb/solver/stats/Stats.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/stats/Stats.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/stats/Stats.java index 25acec9..45d4edc 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/stats/Stats.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/stats/Stats.java @@ -29,6 +29,7 @@ import java.util.Iterator ; import java.util.Map ; import java.util.Map.Entry ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; @@ -39,7 +40,6 @@ import org.apache.jena.sparql.sse.Item ; import org.apache.jena.sparql.sse.ItemList ; import org.apache.jena.sparql.sse.ItemWriter ; import org.apache.jena.sparql.util.NodeFactoryExtra ; -import org.apache.jena.sparql.util.Utils ; public class Stats { @@ -101,7 +101,7 @@ public class Stats Item meta = createTagged(StatsMatcher.META) ; addPair(meta.getList(), "timestamp", NodeFactoryExtra.nowAsDateTime()) ; - addPair(meta.getList(), "run@", Utils.nowAsString()) ; + addPair(meta.getList(), "run@", DateTimeUtils.nowAsString()) ; if ( count >= 0 ) addPair(meta.getList(), StatsMatcher.COUNT, NodeFactoryExtra.intToNode((int)count)) ; statsList.add(meta) ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java index 5e4cd3a..e0b4182 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/BulkLoader.java @@ -22,6 +22,7 @@ import java.io.InputStream ; import java.util.List ; import org.apache.jena.atlas.event.EventType ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.riot.Lang ; @@ -29,7 +30,6 @@ import org.apache.jena.riot.RDFDataMgr ; import org.apache.jena.riot.RDFLanguages ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDB ; import org.apache.jena.tdb.TDBException ; import org.apache.jena.tdb.solver.stats.Stats ; @@ -123,7 +123,7 @@ public class BulkLoader { private static void loadTriples$(BulkStreamRDF dest, List<String> urls) { dest.startBulk() ; for ( String url : urls ) { - loadLogger.info("Load: " + url + " -- " + Utils.nowAsString()) ; + loadLogger.info("Load: " + url + " -- " + DateTimeUtils.nowAsString()) ; Lang lang = RDFLanguages.filenameToLang(url, Lang.NTRIPLES) ; RDFDataMgr.parse(dest, url, lang) ; } @@ -132,7 +132,7 @@ public class BulkLoader { /** Load into a graph */ private static void loadTriples$(BulkStreamRDF dest, InputStream input) { - loadLogger.info("Load: from input stream -- " + Utils.nowAsString()) ; + loadLogger.info("Load: from input stream -- " + DateTimeUtils.nowAsString()) ; dest.startBulk() ; RDFDataMgr.parse(dest, input, Lang.NTRIPLES) ; dest.finishBulk() ; @@ -142,7 +142,7 @@ public class BulkLoader { private static void loadQuads$(BulkStreamRDF dest, List<String> urls) { dest.startBulk() ; for ( String url : urls ) { - loadLogger.info("Load: " + url + " -- " + Utils.nowAsString()) ; + loadLogger.info("Load: " + url + " -- " + DateTimeUtils.nowAsString()) ; Lang lang = RDFLanguages.filenameToLang(url, Lang.NQUADS) ; RDFDataMgr.parse(dest, url, lang) ; } @@ -151,7 +151,7 @@ public class BulkLoader { /** Load quads into a dataset */ private static void loadQuads$(BulkStreamRDF dest, InputStream input) { - loadLogger.info("Load: from input stream -- " + Utils.nowAsString()) ; + loadLogger.info("Load: from input stream -- " + DateTimeUtils.nowAsString()) ; dest.startBulk() ; RDFDataMgr.parse(dest, input, RDFLanguages.NQUADS) ; dest.finishBulk() ; http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/LoadMonitor.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/LoadMonitor.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/LoadMonitor.java index 660e65c..08deca6 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/LoadMonitor.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader/LoadMonitor.java @@ -18,9 +18,9 @@ package org.apache.jena.tdb.store.bulkloader; -import static org.apache.jena.sparql.util.Utils.nowAsString ; import org.apache.jena.atlas.event.Event ; import org.apache.jena.atlas.event.EventManager ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.Timer ; import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.util.StringUtils ; @@ -257,7 +257,7 @@ public final class LoadMonitor private void elapsed(long timerReading) { float elapsedSecs = (timerReading-processStartTime)/1000F ; - print(" Elapsed: %,.2f seconds [%s]", elapsedSecs, nowAsString()) ; + print(" Elapsed: %,.2f seconds [%s]", elapsedSecs, DateTimeUtils.nowAsString()) ; } private static boolean tickPoint(long counter, long quantum) http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java index 3bfda7c..4cb191c 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdIndexCopy.java @@ -18,10 +18,9 @@ package org.apache.jena.tdb.store.bulkloader2; -import static org.apache.jena.sparql.util.Utils.nowAsString ; - import java.util.Iterator ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.Tuple ; import org.apache.jena.atlas.logging.LogCtl ; import org.apache.jena.atlas.logging.ProgressLogger ; @@ -110,7 +109,7 @@ public class CmdIndexCopy float rate = (elapsedSecs!=0) ? counter/elapsedSecs : 0 ; - print("Total: %,d records : %,.2f seconds : %,.2f records/sec [%s]", counter, elapsedSecs, rate, nowAsString()) ; + print("Total: %,d records : %,.2f seconds : %,.2f records/sec [%s]", counter, elapsedSecs, rate, DateTimeUtils.nowAsString()) ; } static private void print(String fmt, Object...args) http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java index 9bbd97b..3b953bb 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java @@ -18,8 +18,6 @@ package org.apache.jena.tdb.store.bulkloader2; -import static org.apache.jena.sparql.util.Utils.nowAsString ; - import java.io.FileNotFoundException ; import java.io.FileOutputStream ; import java.io.OutputStream ; @@ -28,6 +26,7 @@ import java.util.List ; import org.apache.jena.atlas.AtlasException ; import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.atlas.lib.FileOps ; import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.logging.LogCtl ; @@ -38,7 +37,6 @@ import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; import org.apache.jena.riot.RiotReader ; import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDB ; import org.apache.jena.tdb.base.file.Location ; import org.apache.jena.tdb.setup.DatasetBuilderStd ; @@ -157,7 +155,7 @@ public class CmdNodeTableBuilder extends CmdGeneral for( String filename : datafiles) { if ( datafiles.size() > 0 ) - cmdLog.info("Load: "+filename+" -- "+Utils.nowAsString()) ; + cmdLog.info("Load: "+filename+" -- "+DateTimeUtils.nowAsString()) ; RiotReader.parse(filename, sink) ; } sink.finishBulk() ; @@ -176,7 +174,7 @@ public class CmdNodeTableBuilder extends CmdGeneral long total = monitor.getTicks() ; float elapsedSecs = time/1000F ; float rate = (elapsedSecs!=0) ? total/elapsedSecs : 0 ; - String str = String.format("Total: %,d tuples : %,.2f seconds : %,.2f tuples/sec [%s]", total, elapsedSecs, rate, nowAsString()) ; + String str = String.format("Total: %,d tuples : %,.2f seconds : %,.2f tuples/sec [%s]", total, elapsedSecs, rate, DateTimeUtils.nowAsString()) ; cmdLog.info(str) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/692118f9/jena-tdb/src/main/java/tdb/tdbconfig.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/tdbconfig.java b/jena-tdb/src/main/java/tdb/tdbconfig.java index 9e3165c..69525e8 100644 --- a/jena-tdb/src/main/java/tdb/tdbconfig.java +++ b/jena-tdb/src/main/java/tdb/tdbconfig.java @@ -23,10 +23,10 @@ import java.util.List ; import java.util.Map ; import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.lib.DateTimeUtils ; import org.apache.jena.graph.Node ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.sparql.core.DatasetPrefixStorage ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDB ; import org.apache.jena.tdb.base.file.FileFactory ; import org.apache.jena.tdb.base.file.Location ; @@ -232,7 +232,7 @@ public class tdbconfig extends CmdSub @Override protected void exec() { - System.out.println("-- "+Utils.nowAsString()+" --") ; + System.out.println("-- "+DateTimeUtils.nowAsString()+" --") ; ModVersion v = new ModVersion(true) ; v.addClass(TDB.class) ; v.printVersionAndExit() ;
