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 2019/05/09 12:39:14 UTC
[jena] branch geosparql updated: JENA-664: Move module
jena-fuseki-geosparql under jena-fuseki2
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/geosparql by this push:
new c2a8f30 JENA-664: Move module jena-fuseki-geosparql under jena-fuseki2
c2a8f30 is described below
commit c2a8f30847b96a3ae3633ee5fabe7852fed4881c
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu May 9 13:37:29 2019 +0100
JENA-664: Move module jena-fuseki-geosparql under jena-fuseki2
---
.../jena-fuseki-geosparql}/pom.xml | 10 +++++-----
.../org/apache/jena/fuseki/geosparql/DatasetException.java | 0
.../org/apache/jena/fuseki/geosparql/DatasetOperations.java | 0
.../java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java | 0
.../src/main/java/org/apache/jena/fuseki/geosparql/Main.java | 0
.../java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java | 0
.../apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java | 0
.../org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java | 0
.../apache/jena/fuseki/geosparql/cli/IntegerListConverter.java | 0
.../apache/jena/fuseki/geosparql/cli/LongListConverter.java | 0
.../org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java | 0
.../org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java | 0
.../test/java/org/apache/jena/fuseki/geosparql/MainTest.java | 0
.../apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java | 0
.../apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java | 0
pom.xml | 9 ++++++---
16 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/jena-fuseki-geosparql/pom.xml b/jena-fuseki2/jena-fuseki-geosparql/pom.xml
similarity index 98%
rename from jena-fuseki-geosparql/pom.xml
rename to jena-fuseki2/jena-fuseki-geosparql/pom.xml
index 16c2099..8b9ecf7 100644
--- a/jena-fuseki-geosparql/pom.xml
+++ b/jena-fuseki2/jena-fuseki-geosparql/pom.xml
@@ -22,12 +22,12 @@
<version>3.12.0-SNAPSHOT</version>
<parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena</artifactId>
- <version>3.12.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-fuseki</artifactId>
+ <version>3.12.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
-
+
<!-- @@ TODO @@
Should we have a separate shader module?
-->
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/GeosparqlServer.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/Main.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/ArgsConfig.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphDelimiter.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/FileGraphFormat.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/IntegerListConverter.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/LongListConverter.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameter.java
diff --git a/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
similarity index 100%
rename from jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameter.java
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
similarity index 100%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
similarity index 100%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/RDFFileParameterTest.java
diff --git a/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
similarity index 100%
rename from jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
rename to jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/cli/TabFileParameterTest.java
diff --git a/pom.xml b/pom.xml
index 57a8a0a..b05a575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,10 +179,10 @@
<module>jena-cmds</module>
<module>jena-fuseki2</module>
- <module>jena-integration-tests</module>
-
<module>jena-geosparql</module>
- <module>jena-fuseki-geosparql</module>
+ <module>jena-fuseki2/jena-fuseki-geosparql</module>
+
+ <module>jena-integration-tests</module>
<!-- Binary distribution -->
<!-- <module>apache-jena</module> -->
@@ -238,6 +238,9 @@
<module>jena-cmds</module>
<module>jena-fuseki2</module>
+ <module>jena-geosparql</module>
+ <module>jena-fuseki2/jena-fuseki-geosparql</module>
+
<!--
Tests of artifacts that require additional
modules built later in the build process.