Skip to content

Commit

Permalink
JENA-664: Merge branch 'geosparql'
Browse files Browse the repository at this point in the history
  • Loading branch information
@afs
afs committed May 21, 2019
2 parents 8faec41 + b4e5549 commit 6573893
Show file tree
Hide file tree
Showing 334 changed files with 47,107 additions and 0 deletions.
3 changes: 3 additions & 0 deletions NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ This product includes software developed by Mort Bay Consulting Pty. Ltd.
Portions of this software are from Apache Xerces and were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.

This product includes software developed at the Open Geospatial Consortium:
http://www.opengeospatial.org/ogc/software
220 changes: 220 additions & 0 deletions jena-fuseki2/jena-fuseki-geosparql/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-fuseki-geosparql</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - Fuseki with GeoSPARQL Engine </name>
<version>3.12.0-SNAPSHOT</version>

<parent>
<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?
-->

<description>GeoSPARQL with Fuseki</description>

<properties>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
<!-- @@ TODO Need final check @@ -->
<automatic.module.name>org.apache.jena.jena-fuseki-geosparql</automatic.module.name>
</properties>

<dependencies>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-geosparql</artifactId>
<version>3.12.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>io.github.galbiston</groupId>
<artifactId>rdf-tables</artifactId>
<version>1.0.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb2</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-main</artifactId>
<version>3.12.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>

<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.72</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.26</version>
</dependency>

</dependencies>

<build>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<!--
The test collections TC_General, TC_Riot, TC_Atlas
are development support that collect the relevant
tests for partial testing during development.
-->
<include>**/TS_*.java</include>
<include>**/TC_Scripted.java</include>
<include>**/TC_DAWG.java</include>
</includes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>

<executions>
<execution>
<id>attach-sources</id>
<!-- <phase>package</phase> package is the default -->
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
<execution>
<id>attach-sources-test</id>
<goals>
<goal>test-jar-no-fork</goal>
</goals>
</execution>
</executions>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<version>true</version>
<show>public</show>
<quiet>true</quiet>
<encoding>UTF-8</encoding>
<windowtitle>Apache Jena GeoSPARQL</windowtitle>
<doctitle>Apache Jena GeoSPARQL ${project.version}</doctitle>
<bottom>Licenced under the Apache License, Version 2.0</bottom>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<shadedArtifactAttached>false</shadedArtifactAttached>
<transformers>
<!-- @@@ TODO @@ -->
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.github.galbiston.geosparql_fuseki.Main</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<!-- Some jars are signed but shading breaks that.
Don't include signing files.
-->
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
<phase>package</phase>
<!--<phase /><!- - Switch off -->
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>

</build>

</project>
33 changes: 33 additions & 0 deletions ...ena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetException.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jena.fuseki.geosparql;

/**
*
*
*/
public class DatasetException extends Exception {

public DatasetException(String msg) {
super(msg);
}

public DatasetException(String msg, Throwable cause) {
super(msg, cause);
}
}
Loading

0 comments on commit 6573893

Please sign in to comment.