added aksw to package names in cli module

GeoKnow · 2c07ebc88ad4542c890e680f1792b3e060fba041 · Claus Stadler committed Jun 28, 2017 · Jun 28, 2017 · 2c07ebc
1 parent c62f465
commit 2c07ebc88ad4542c890e680f1792b3e060fba041
diff --git a/build-deb-and-install.sh b/build-deb-and-install.sh
diff --git a/linkedgeodata-cli/pom.xml b/linkedgeodata-cli/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>jcommander</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/main/CommandMain.java b/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/main/CommandMain.java
@@ -0,0 +1,5 @@
+package org.aksw.linkedgeodata.cli.command.main;
+
+public class CommandMain {
+    // Placeholder for entry point to general lgd related commands
+}
diff --git a/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/main/CommandOsm.java b/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/main/CommandOsm.java
@@ -0,0 +1,5 @@
+package org.aksw.linkedgeodata.cli.command.main;
+
+public class CommandOsm {
+	// Placeholder for entry point to osm related commands
+}
diff --git a/...geodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/osm/CommandOsmDateToSeq.java b/...geodata-cli/src/main/java/org/aksw/linkedgeodata/cli/command/osm/CommandOsmDateToSeq.java
@@ -0,0 +1,47 @@
+package org.aksw.linkedgeodata.cli.command.osm;
+
+import java.time.Instant;
+import java.util.Properties;
+
+import org.aksw.linkedgeodata.osm.replication.dao.OsmRepoDao;
+import org.aksw.linkedgeodata.osm.replication.dao.OsmRepoDaoImpl;
+import org.aksw.linkedgeodata.osm.replication.dao.State;
+import org.aksw.linkedgeodata.osm.replication.dao.StateImpl;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+
+public class CommandOsmDateToSeq {
+
+    @Parameter(names = {"-u", "-url"}, description = "OSM Repository base URL")
+    public String osmReplicationRepoBaseUrl = null;
+
+    @Parameter(names = {"-d", "-date"}, description = "Timestamp")
+    public String timestamp = null;
+
+    public static void main(String[] args) throws Exception {
+
+        CommandOsmDateToSeq options = new CommandOsmDateToSeq();
+        JCommander jCommander = new JCommander(options);
+        jCommander.parse(args);
+
+        OsmRepoDao repoDao = OsmRepoDaoImpl.create(options.osmReplicationRepoBaseUrl);
+
+        Instant instant = Instant.parse(options.timestamp);
+
+
+        State state = repoDao.findState(instant);
+
+        java.util.Properties properties = StateImpl.toProperties(new Properties(), state);
+        properties.store(System.out, null);
+
+
+//        if(commandLineArgs.isHelp())
+//        {
+//            jCommander.usage();
+//            System.exit(0);
+//        }
+//
+//
+    }
+}
diff --git a/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/main/MainLinkedGeoData.java b/linkedgeodata-cli/src/main/java/org/aksw/linkedgeodata/cli/main/MainLinkedGeoData.java
@@ -0,0 +1,5 @@
+package org.aksw.linkedgeodata.cli.main;
+
+public class MainLinkedGeoData {
+    // Placeholder for entry point to lgd related commands
+}
diff --git a/linkedgeodata-cli/src/main/java/org/linkedgeodata/cli/MainLinkedGeoData.java b/linkedgeodata-cli/src/main/java/org/linkedgeodata/cli/MainLinkedGeoData.java
@@ -1,7 +0,0 @@
-package org.linkedgeodata.cli;
-
-public class MainLinkedGeoData {
-    public static void main() {
-
-    }
-}
diff --git a/linkedgeodata-cli/src/main/resources/log4j.properties b/linkedgeodata-cli/src/main/resources/log4j.properties
@@ -0,0 +1,41 @@
+# Appenders are output targets
+###############################################################################
+# console logging
+###############################################################################
+log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+log4j.appender.stderr.Target=System.err
+log4j.appender.stderr.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.stderr.layout.ConversionPattern=%d [%t] %-5p %c{1.}: %m%n
+#log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c: %m%n
+#log4j.appender.stderr.layout.ConversionPattern=%d %-5p %c: %m%n
+
+
+###############################################################################
+# file logging
+###############################################################################
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=lsq.log
+log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p %c{1.}: %m%n
+
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p %c: %m%n
+#log4j.appender.file.layout.ConversionPattern=%d %-5p %c: %m%n
+
+
+###############################################################################
+# Log levels
+###############################################################################
+###
+# syntax: log4j.logger.<your-class>=log-level, [appenders]
+# appenders are the output-targets defined above
+# loglevels: trace, debug, info, warn, error, fatal
+#
+log4j.rootLogger=debug, stderr
+
+#log4j.logger.org.aksw.jena_sparql_api.compare.QueryExecutionCompare = on
+#log4j.logger.Jena = off
+#
+#log4j.logger.org.apache.http = off
+#log4j.logger.org.apache.jena = off
diff --git a/linkedgeodata-core/pom.xml b/linkedgeodata-core/pom.xml
@@ -89,6 +89,10 @@
             <artifactId>spin</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/linkedgeodata-core/src/main/java/org/aksw/linkedgeodata/core/init/InitJenaLinkedGeoData.java b/linkedgeodata-core/src/main/java/org/aksw/linkedgeodata/core/init/InitJenaLinkedGeoData.java
@@ -0,0 +1,37 @@
+package org.aksw.linkedgeodata.core.init;
+
+import org.aksw.linkedgeodata.osm.replication.dao.State;
+import org.aksw.linkedgeodata.osm.replication.dao.StateImpl;
+import org.apache.jena.enhanced.BuiltinPersonalities;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.system.JenaSubsystemLifecycle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.topbraid.spin.util.SimpleImplementation;
+
+public class InitJenaLinkedGeoData
+    implements JenaSubsystemLifecycle
+{
+    private static final Logger logger = LoggerFactory.getLogger(InitJenaLinkedGeoData.class);
+
+    public void start() {
+        logger.debug("LinkedGeoData Jena initialization");
+        init();
+    }
+
+    @Override
+    public void stop() {
+    }
+
+
+    public static final Resource State = ResourceFactory.createResource("http://example.org/osm/State");
+
+    public static void init() {
+
+        BuiltinPersonalities.model
+            .add(State.class, new SimpleImplementation(State.asNode(), StateImpl.class));
+    }
+
+
+}
diff --git a/...geodata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/LgdPersonality.java b/...geodata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/LgdPersonality.java
@@ -1,18 +0,0 @@
-package org.aksw.linkedgeodata.osm.replication.dao;
-
-import org.apache.jena.enhanced.BuiltinPersonalities;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.topbraid.spin.util.SimpleImplementation;
-
-public class LgdPersonality {
-    public static final Resource State = ResourceFactory.createResource("http://example.org/osm/State");
-
-    public static void init() {
-
-        BuiltinPersonalities.model
-            .add(State.class, new SimpleImplementation(State.asNode(), StateImpl.class));
-    }
-
-
-}
diff --git a/...ata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/OsmRepoCoreDaoImpl.java b/...ata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/OsmRepoCoreDaoImpl.java
@@ -26,6 +26,7 @@
 
 import javax.ws.rs.core.UriBuilder;
 
+import org.aksw.linkedgeodata.core.init.InitJenaLinkedGeoData;
 import org.apache.commons.io.IOUtils;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Resource;
@@ -95,7 +96,7 @@ public State getState(long seqId) throws Exception {
 
 
     public State getState(URI uri) throws Exception {
-        logger.debug("Attempting to retrieve: " + uri);
+        logger.info("Retrieving state information for " + uri);
 
         URLConnection conn = uri.toURL().openConnection();
         conn.setReadTimeout(10000);
@@ -106,8 +107,7 @@ public State getState(URI uri) throws Exception {
         StringWriter w = new StringWriter();
         IOUtils.copy(conn.getInputStream(), w, StandardCharsets.UTF_8);
         String content = w.toString();
-        logger.info("Retrieving state information for " + uri);
-        logger.info("Reponse from " + uri + ": " + content);
+        logger.debug("Reponse from " + uri + ":\n" + content);
 
         properties.load(new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)));
 
@@ -117,7 +117,7 @@ public State getState(URI uri) throws Exception {
 
         State result = ModelFactory.createDefaultModel()
                 .createResource()
-                .addProperty(RDF.type, LgdPersonality.State)
+                .addProperty(RDF.type, InitJenaLinkedGeoData.State)
                 .as(State.class);
 
         properties.entrySet().forEach(e ->
@@ -131,7 +131,6 @@ public State getState(URI uri) throws Exception {
 
     public static void main(String[] args) throws Exception {
 
-        LgdPersonality.init();
         Instant src = Instant.parse("2017-05-26T20:44:02Z");
 
         //OsmRepoDao repoDao = OsmRepoDaoImpl.create("http://download.geofabrik.de/europe/monaco-updates");
diff --git a/linkedgeodata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/StateImpl.java b/linkedgeodata-core/src/main/java/org/aksw/linkedgeodata/osm/replication/dao/StateImpl.java
@@ -1,6 +1,7 @@
 package org.aksw.linkedgeodata.osm.replication.dao;
 
 import java.util.Calendar;
+import java.util.Properties;
 
 import org.apache.jena.datatypes.xsd.XSDDateTime;
 import org.apache.jena.enhanced.EnhGraph;
@@ -28,4 +29,12 @@ public long getSeqId() {
         long result = this.getRequiredProperty(DCTerms.identifier).getLong();
         return result;
     }
+
+
+    public static Properties toProperties(Properties result, State state) {
+        result.setProperty("timestamp", state.getTimestamp().toInstant().toString());
+        result.setProperty("sequenceNumber", Long.toString(state.getSeqId()));
+
+        return result;
+    }
 }
diff --git a/...a-core/src/main/resources/META-INF/services/org.apache.jena.system.JenaSubsystemLifecycle b/...a-core/src/main/resources/META-INF/services/org.apache.jena.system.JenaSubsystemLifecycle
@@ -0,0 +1 @@
+org.aksw.linkedgeodata.core.init.InitJenaLinkedGeoData