update for jenax refactoring

Author: SimonBin

rdf-processing-toolkit-cli/src/main/java/org/aksw/rdf_processing_toolkit/cli/cmd/CliUtils.java

@@ -3,10 +3,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import org.aksw.jena_sparql_api.arq.service.vfs.ServiceExecutorFactoryRegistratorVfs;
 import org.aksw.jena_sparql_api.common.DefaultPrefixes;
 import org.aksw.jena_sparql_api.sparql.ext.http.JenaExtensionHttp;
 import org.aksw.jena_sparql_api.sparql.ext.util.JenaExtensionUtil;
+import org.aksw.jenax.arq.service.vfs.ServiceExecutorFactoryRegistratorVfs;
 import org.aksw.sparql_integrate.cli.cmd.CmdSparqlIntegrateMain;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.jena.query.ARQ;

rdf-processing-toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java

@@ -3,6 +3,8 @@
 import java.awt.Desktop;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -844,15 +846,20 @@ public void afterExec() {
 
                 server.start();
 
-                URI browseUri = new URI("http://localhost:" + port + "/sparql");
+                String hostAddress;
+                try(final DatagramSocket socket = new DatagramSocket()){
+                    socket.connect(InetAddress.getByName("1.1.1.1"), 53);
+                    hostAddress = socket.getLocalAddress().getHostAddress();
+                }
+                URI browseUri = new URI("http://"+hostAddress+":" + port + "/");
                 if (Desktop.isDesktopSupported()) {
                     try {
-                        Desktop.getDesktop().browse(browseUri);
+                        Desktop.getDesktop().browse(new URI("http://localhost:"+port));
                     } catch (UnsupportedOperationException e) {
                         logger.info("Note: Could not open system browser.");
                     }
                 }
-                logger.info("SPARQL service running at: " + browseUri);
+                logger.info("SPARQL service running at: " + browseUri + "sparql");
             }
 
             try (RDFConnection conn = finalDataSource.getConnection()) {

rdf-processing-toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateLegacyDataSources.java

@@ -13,8 +13,8 @@
 
 import org.aksw.commons.io.util.symlink.SymbolicLinkStrategies;
 import org.aksw.difs.builder.DifsFactory;
-import org.aksw.jena_sparql_api.arq.service.vfs.ServiceExecutorFactoryRegistratorVfs;
 import org.aksw.jenax.arq.engine.quad.RDFConnectionFactoryQuadForm;
+import org.aksw.jenax.arq.service.vfs.ServiceExecutorFactoryRegistratorVfs;
 import org.aksw.jenax.dataaccess.sparql.factory.dataengine.RdfDataEngineFromDataset;
 import org.aksw.jenax.dataaccess.sparql.factory.dataset.connection.DatasetRDFConnectionFactory;
 import org.aksw.jenax.dataaccess.sparql.factory.dataset.connection.DatasetRDFConnectionFactoryBuilder;