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 2013/09/06 22:38:20 UTC
svn commit: r1520689 - in /jena/trunk/jena-spatial: ./
src/main/java/examples/ src/main/java/org/apache/jena/query/spatial/
src/main/java/org/apache/jena/query/spatial/assembler/
src/main/java/org/apache/jena/query/spatial/pfunction/ src/main/java/org/...
Author: andy
Date: Fri Sep 6 20:38:19 2013
New Revision: 1520689
URL: http://svn.apache.org/r1520689
Log:
Release preparation:
Remove embedded solr so that server-side of Solr is not a dependency.
Exception in assembler if "embedded:" used.
Remove warnings from the code base and add some @Override's
Remove throws declarations of unthrown exceptions.
Remove JTS from the POM, even optional, so as not to risk inclusion in the build.
Modified:
jena/trunk/jena-spatial/ (props changed)
jena/trunk/jena-spatial/pom.xml
jena/trunk/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexSolrAssembler.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/DirectionWithPointPFBase.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialMatch.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithBoxPFBase.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithCircleBase.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/EastPF.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TS_Spatial.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestSpatialIndexLuceneAssembler.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestEastPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIntersectsBoxPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsNearByPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinBoxPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinCirclePFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestSouthPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestWestPFWithLuceneSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestEastPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsNearByPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestNorthPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestSouthPFWithEmbeddedSolrSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestWestPFWithEmbeddedSolrSpatialIndex.java
Propchange: jena/trunk/jena-spatial/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 6 20:38:19 2013
@@ -0,0 +1,5 @@
+classes
+target
+.settings
+.classpath
+.project
Modified: jena/trunk/jena-spatial/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/pom.xml?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/pom.xml (original)
+++ jena/trunk/jena-spatial/pom.xml Fri Sep 6 20:38:19 2013
@@ -1,274 +1,268 @@
-<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>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-spatial</artifactId>
- <packaging>jar</packaging>
- <name>Apache Jena - SPARQL and Lucene/Solr Spatial</name>
- <version>1.0.1-SNAPSHOT</version>
-
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>7-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
- </parent>
-
- <properties>
- <ver.jena>2.11.0-SNAPSHOT</ver.jena>
- <ver.lucene>4.3.1</ver.lucene>
- <ver.solr>4.3.1</ver.solr>
- <ver.spatial4j>0.3</ver.spatial4j>
- <ver.jts>1.13</ver.jts>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <jdk.version>1.6</jdk.version>
- <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
- <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
- </properties>
-
- <dependencies>
-
- <!-- All Jena libs (not Fuseki) -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <version>${ver.jena}</version>
- <type>pom</type>
- </dependency>
-
- <!-- Testing support -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>${ver.jena}</version>
- <type>jar</type>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <!-- Lucene dependencies -->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.spatial4j</groupId>
- <artifactId>spatial4j</artifactId>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>com.vividsolutions</groupId>
- <artifactId>jts</artifactId>
- <version>${ver.jts}</version>
- <optional>true</optional>
- </dependency>
-
-
- <!-- Solr client -->
- <!-- Exclusion of slf4: Necessary otherwise maven complains about a "Dependency
- convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena) possibly
- due to the use of scope-test -->
-
- <dependency>
- <artifactId>solr-solrj</artifactId>
- <groupId>org.apache.solr</groupId>
- <version>${ver.solr}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Embedded server / testing -->
- <dependency>
- <artifactId>solr-core</artifactId>
- <groupId>org.apache.solr</groupId>
- <version>${ver.solr}</version>
- <type>jar</type>
- <!-- <scope>test</scope> <optional>true</optional> -->
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Embedded Solr server -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <!-- <scope>test</scope> -->
- </dependency>
-
- </dependencies>
-
- <build>
-
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>org/apache/jena/query/spatial/properties.xml</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>org/apache/jena/query/spatial/properties.xml</exclude>
- </excludes>
- </resource>
- </resources>
-
- <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>
- <include>**/TS_*.java</include>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only material in the main jar <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-javadoc-plugin</artifactId>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licenced under the Apache License, Version 2.0</bottom>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <!-- By default, have separate Eclipse and maven build areas -->
- <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
-
- <repositories>
- <repository>
- <id>maven-restlet</id>
- <name>Public online Restlet repository</name>
- <url>http://maven.restlet.org</url>
- </repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>osgeo</id>
- <name>Open Source Geospatial Foundation Repository</name>
- <url>http://download.osgeo.org/webdav/geotools/</url>
- </repository>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>opengeo</id>
- <name>OpenGeo Maven Repository</name>
- <url>http://repo.opengeo.org</url>
- </repository>
- </repositories>
-
-</project>
+<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>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-spatial</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Jena - SPARQL Spatial Search</name>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath>../jena-parent</relativePath>
+ </parent>
+
+ <properties>
+ <ver.jena>2.11.0-SNAPSHOT</ver.jena>
+ <ver.lucene>4.3.1</ver.lucene>
+ <ver.solr>4.3.1</ver.solr>
+ <ver.spatial4j>0.3</ver.spatial4j>
+ <ver.jts>1.13</ver.jts>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <jdk.version>1.6</jdk.version>
+ <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+ <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
+ </properties>
+
+ <dependencies>
+
+ <!-- All Jena libs -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <version>${ver.jena}</version>
+ <type>pom</type>
+ </dependency>
+
+ <!-- Testing support -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>${ver.jena}</version>
+ <type>jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Lucene dependencies -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>com.spatial4j</groupId>
+ <artifactId>spatial4j</artifactId>
+ <version>0.3</version>
+ </dependency>
+
+ <!-- Solr client -->
+ <!-- Exclusion of slf4: Necessary otherwise maven complains about a "Dependency
+ convergence error" of slf4j-api 1.6.1 (from zookeeper) vs 1.6.4 (Jena) possibly
+ due to the use of scope-test -->
+
+ <dependency>
+ <artifactId>solr-solrj</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <version>${ver.solr}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Embedded server / testing -->
+ <dependency>
+ <artifactId>solr-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <version>${ver.solr}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Embedded Solr server -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>org/apache/jena/query/spatial/properties.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>org/apache/jena/query/spatial/properties.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <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>
+ <include>**/TS_*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only material in the main jar <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-javadoc-plugin</artifactId>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licenced under the Apache License, Version 2.0</bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <!-- By default, have separate Eclipse and maven build areas -->
+ <buildOutputDirectory>${project.build.directory}/classes</buildOutputDirectory>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+
+ <repositories>
+ <repository>
+ <id>maven-restlet</id>
+ <name>Public online Restlet repository</name>
+ <url>http://maven.restlet.org</url>
+ </repository>
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ <repository>
+ <id>osgeo</id>
+ <name>Open Source Geospatial Foundation Repository</name>
+ <url>http://download.osgeo.org/webdav/geotools/</url>
+ </repository>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>opengeo</id>
+ <name>OpenGeo Maven Repository</name>
+ <url>http://repo.opengeo.org</url>
+ </repository>
+ </repositories>
+
+</project>
Modified: jena/trunk/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/examples/JenaSpatialExample1.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/examples/JenaSpatialExample1.java (original)
+++ jena/trunk/jena-spatial/src/main/java/examples/JenaSpatialExample1.java Fri Sep 6 20:38:19 2013
@@ -18,36 +18,23 @@
package examples;
-import java.io.File;
-import java.io.IOException;
+import java.io.File ;
+import java.io.IOException ;
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.atlas.logging.Log;
-import org.apache.jena.query.spatial.EntityDefinition;
-import org.apache.jena.query.spatial.SpatialDatasetFactory;
-import org.apache.jena.query.spatial.SpatialIndex;
-import org.apache.jena.query.spatial.SpatialIndexLucene;
-import org.apache.jena.query.spatial.SpatialIndexSolr;
-import org.apache.jena.query.spatial.SpatialQuery;
-import org.apache.jena.riot.RDFDataMgr;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.ReadWrite;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.sparql.util.QueryExecUtils;
-import com.hp.hpl.jena.tdb.TDBFactory;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.query.spatial.* ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.lucene.store.Directory ;
+import org.apache.lucene.store.FSDirectory ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ResourceFactory ;
+import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
/** Build a spatial search dataset */
public class JenaSpatialExample1 {
@@ -84,14 +71,14 @@ public class JenaSpatialExample1 {
deleteOldFiles(LUCENE_TDB_DIR);
}
- else if (index instanceof SpatialIndexSolr){
- SolrServer server = ((SpatialIndexSolr)index).getServer();
-
- if (server instanceof EmbeddedSolrServer){
- server.shutdown();
- deleteOldFiles(SOLR_DATA_DIR);
- }
- }
+// else if (index instanceof SpatialIndexSolr){
+// SolrServer server = ((SpatialIndexSolr)index).getServer();
+//
+// if (server instanceof EmbeddedSolrServer){
+// server.shutdown();
+// deleteOldFiles(SOLR_DATA_DIR);
+// }
+// }
}
private static void emptyAndDeleteDirectory(File dir) {
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java Fri Sep 6 20:38:19 2013
@@ -38,7 +38,6 @@ public class SpatialIndexContext {
this.defn = indexer.getDocDef();
this.indexer = indexer;
this.spatialPredicatePairValues = new HashMap<String, Set<SpatialPredicatePairValue>>();
- ;
}
public void index(Node g, Node s, Node p, Node o) {
@@ -94,8 +93,8 @@ public class SpatialIndexContext {
pairValues.add(toAdd);
} else if (defn.isWKTPredicate(p) && SpatialValueUtil.isWKTLiteral(o.getLiteral())) {
-
- Shape shape = SpatialQuery.ctx.readShape(o.getLiteralLexicalForm());
+ @SuppressWarnings("deprecation")
+ Shape shape = SpatialQuery.ctx.readShape(o.getLiteralLexicalForm());
indexer.add(x, shape);
}
}
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java Fri Sep 6 20:38:19 2013
@@ -18,44 +18,34 @@
package org.apache.jena.query.spatial;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.spatial.SpatialStrategy;
-import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
-import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
-import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
-import org.apache.lucene.spatial.query.SpatialArgs;
-import org.apache.lucene.spatial.query.SpatialOperation;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.Shape;
+import java.io.IOException ;
+import java.util.ArrayList ;
+import java.util.List ;
+
+import org.apache.lucene.analysis.Analyzer ;
+import org.apache.lucene.analysis.standard.StandardAnalyzer ;
+import org.apache.lucene.document.Document ;
+import org.apache.lucene.document.Field ;
+import org.apache.lucene.document.FieldType ;
+import org.apache.lucene.index.* ;
+import org.apache.lucene.queries.function.ValueSource ;
+import org.apache.lucene.search.* ;
+import org.apache.lucene.spatial.SpatialStrategy ;
+import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy ;
+import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree ;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree ;
+import org.apache.lucene.spatial.query.SpatialArgs ;
+import org.apache.lucene.spatial.query.SpatialOperation ;
+import org.apache.lucene.store.Directory ;
+import org.apache.lucene.util.Version ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
+import com.spatial4j.core.shape.Point ;
+import com.spatial4j.core.shape.Shape ;
public class SpatialIndexLucene implements SpatialIndex {
private static Logger log = LoggerFactory
@@ -204,8 +194,7 @@ public class SpatialIndexLucene implemen
}
}
- private List<Node> query$(IndexReader indexReader, Shape shape, int limit, SpatialOperation operation) throws ParseException,
- IOException {
+ private List<Node> query$(IndexReader indexReader, Shape shape, int limit, SpatialOperation operation) throws IOException {
if (limit <= 0)
limit = MAX_N;
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java Fri Sep 6 20:38:19 2013
@@ -109,6 +109,7 @@ public class SpatialIndexSolr implements
}
}
+ @SuppressWarnings("deprecation")
private SolrInputDocument solrDoc(String entityURI, Shape... shapes) {
SolrInputDocument doc = new SolrInputDocument();
doc.addField(docDef.getEntityField(), entityURI);
@@ -118,7 +119,6 @@ public class SpatialIndexSolr implements
+ shapes.length + " shapes.");
}
doc.addField(docDef.getGeoField(), SpatialQuery.ctx.toString(shapes[0]));
-
return doc;
}
@@ -140,6 +140,7 @@ public class SpatialIndexSolr implements
return results;
}
+ @SuppressWarnings("deprecation")
private SolrDocumentList solrQuery(Shape shape, int limit,
SpatialOperation operation) {
SolrQuery sq = new SolrQuery();
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java Fri Sep 6 20:38:19 2013
@@ -51,7 +51,6 @@ public class SpatialIndexLuceneAssembler
.
*/
- @SuppressWarnings("resource")
@Override
public SpatialIndex open(Assembler a, Resource root, Mode mode)
{
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexSolrAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexSolrAssembler.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexSolrAssembler.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexSolrAssembler.java Fri Sep 6 20:38:19 2013
@@ -18,28 +18,20 @@
package org.apache.jena.query.spatial.assembler;
-import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDefinition;
-import static org.apache.jena.query.spatial.assembler.SpatialVocab.pServer;
-import static org.apache.jena.query.spatial.assembler.SpatialVocab.pSolrHome;
-
-import java.io.FileNotFoundException;
-
-import org.apache.jena.query.spatial.EntityDefinition;
-import org.apache.jena.query.spatial.SpatialDatasetFactory;
-import org.apache.jena.query.spatial.SpatialIndex;
-import org.apache.jena.query.spatial.SpatialIndexException;
-import org.apache.jena.riot.system.IRILib;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
-import org.apache.solr.core.CoreContainer;
-
-import com.hp.hpl.jena.assembler.Assembler;
-import com.hp.hpl.jena.assembler.Mode;
-import com.hp.hpl.jena.assembler.assemblers.AssemblerBase;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.sparql.util.graph.GraphUtils;
+import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDefinition ;
+import static org.apache.jena.query.spatial.assembler.SpatialVocab.pServer ;
+import org.apache.jena.query.spatial.EntityDefinition ;
+import org.apache.jena.query.spatial.SpatialDatasetFactory ;
+import org.apache.jena.query.spatial.SpatialIndex ;
+import org.apache.jena.query.spatial.SpatialIndexException ;
+import org.apache.solr.client.solrj.SolrServer ;
+import org.apache.solr.client.solrj.impl.HttpSolrServer ;
+
+import com.hp.hpl.jena.assembler.Assembler ;
+import com.hp.hpl.jena.assembler.Mode ;
+import com.hp.hpl.jena.assembler.assemblers.AssemblerBase ;
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
public class SpatialIndexSolrAssembler extends AssemblerBase {
/*
@@ -53,29 +45,30 @@ public class SpatialIndexSolrAssembler e
String uri = GraphUtils.getResourceValue(root, pServer).getURI();
SolrServer server;
if (uri.startsWith("embedded:")) {
- try {
- if ( ! GraphUtils.exactlyOneProperty(root, pSolrHome) )
- throw new SpatialIndexException("No 'spatial:solrHome' property on EmbeddedSolrServer "+root) ;
-
- RDFNode n = root.getProperty(pSolrHome).getObject() ;
-
- if (n.isLiteral()){
- throw new SpatialIndexException ("No 'spatial:solrHome' property on EmbeddedSolrServer "+root+ " is a literal and not a Resource/URI");
- }
- Resource x = n.asResource() ;
- String path = IRILib.IRIToFilename(x.getURI()) ;
-
- System.setProperty("solr.solr.home", path);
- String coreName = uri.substring("embedded:".length());
- CoreContainer.Initializer initializer = new CoreContainer.Initializer();
- CoreContainer coreContainer = initializer.initialize();
- server = new EmbeddedSolrServer(coreContainer, coreName);
- } catch (FileNotFoundException e) {
- throw new SpatialIndexException(e);
- // throw new
- // SpatialIndexException("Embedded Solr server not supported (change code and dependencies to enable)")
- // ;
- }
+ throw new SpatialIndexException("Embedded Solr server not supported (change code and dependencies to enable)") ;
+// try {
+// if ( ! GraphUtils.exactlyOneProperty(root, pSolrHome) )
+// throw new SpatialIndexException("No 'spatial:solrHome' property on EmbeddedSolrServer "+root) ;
+//
+// RDFNode n = root.getProperty(pSolrHome).getObject() ;
+//
+// if (n.isLiteral()){
+// throw new SpatialIndexException ("No 'spatial:solrHome' property on EmbeddedSolrServer "+root+ " is a literal and not a Resource/URI");
+// }
+// Resource x = n.asResource() ;
+// String path = IRILib.IRIToFilename(x.getURI()) ;
+//
+// System.setProperty("solr.solr.home", path);
+// String coreName = uri.substring("embedded:".length());
+// CoreContainer.Initializer initializer = new CoreContainer.Initializer();
+// CoreContainer coreContainer = initializer.initialize();
+// server = new EmbeddedSolrServer(coreContainer, coreName);
+// } catch (FileNotFoundException e) {
+// throw new SpatialIndexException(e);
+// // throw new
+// // SpatialIndexException("Embedded Solr server not supported (change code and dependencies to enable)")
+// // ;
+// }
} else if (uri.startsWith("http://")) {
server = new HttpSolrServer(uri);
} else
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/DirectionWithPointPFBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/DirectionWithPointPFBase.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/DirectionWithPointPFBase.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/DirectionWithPointPFBase.java Fri Sep 6 20:38:19 2013
@@ -64,7 +64,8 @@ public abstract class DirectionWithPoint
/** Deconstruct the node or list object argument and make a SpatialMatch */
- protected SpatialMatch objectToStruct(PropFuncArg argObject) {
+ @Override
+ protected SpatialMatch objectToStruct(PropFuncArg argObject) {
if (argObject.isNode()) {
log.warn("Object not a List: " + argObject);
return null;
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialMatch.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialMatch.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialMatch.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialMatch.java Fri Sep 6 20:38:19 2013
@@ -59,6 +59,7 @@ public class SpatialMatch {
return operation;
}
+ @Override
public String toString() {
return "(" + shape + " " + limit + " " + operation + ")";
}
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithBoxPFBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithBoxPFBase.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithBoxPFBase.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithBoxPFBase.java Fri Sep 6 20:38:19 2013
@@ -60,6 +60,7 @@ public abstract class SpatialOperationWi
}
/** Deconstruct the node or list object argument and make a SpatialMatch */
+ @Override
protected SpatialMatch objectToStruct(PropFuncArg argObject) {
if (argObject.isNode()) {
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithCircleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithCircleBase.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithCircleBase.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationWithCircleBase.java Fri Sep 6 20:38:19 2013
@@ -62,6 +62,7 @@ public abstract class SpatialOperationWi
}
}
/** Deconstruct the node or list object argument and make a NearbyMatch */
+ @Override
protected SpatialMatch objectToStruct(PropFuncArg argObject) {
// EntityDefinition docDef = server.getDocDef();
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/EastPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/EastPF.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/EastPF.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/EastPF.java Fri Sep 6 20:38:19 2013
@@ -33,8 +33,8 @@ public class EastPF extends DirectionWit
}
/** Deconstruct the node or list object argument and make a SpatialMatch */
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude,
- int limit) {
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
longitude, SpatialQuery.ctx.getWorldBounds().getMaxY(), SpatialQuery.ctx.getWorldBounds()
.getMaxX(), limit, getSpatialOperation());
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/NorthPF.java Fri Sep 6 20:38:19 2013
@@ -33,9 +33,9 @@ public class NorthPF extends DirectionWi
}
/** Deconstruct the node or list object argument and make a SpatialMatch */
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude,
- int limit) {
- SpatialMatch match = new SpatialMatch(latitude, SpatialQuery.ctx
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
+ SpatialMatch match = new SpatialMatch(latitude, SpatialQuery.ctx
.getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds()
.getMaxY(), SpatialQuery.ctx.getWorldBounds().getMaxX(), limit,
getSpatialOperation());
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/SouthPF.java Fri Sep 6 20:38:19 2013
@@ -33,9 +33,8 @@ public class SouthPF extends DirectionWi
}
/** Deconstruct the node or list object argument and make a SpatialMatch */
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude,
- int limit) {
- SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) { SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
SpatialQuery.ctx.getWorldBounds().getMinX(), latitude, SpatialQuery.ctx.getWorldBounds()
.getMaxX(), limit, getSpatialOperation());
return match;
Modified: jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java (original)
+++ jena/trunk/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/library/WestPF.java Fri Sep 6 20:38:19 2013
@@ -33,9 +33,9 @@ public class WestPF extends DirectionWit
}
/** Deconstruct the node or list object argument and make a SpatialMatch */
- protected SpatialMatch getSpatialMatch(Double latitude, Double longitude,
- int limit) {
- SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
+ @Override
+ protected SpatialMatch getSpatialMatch(Double latitude, Double longitude, int limit) {
+ SpatialMatch match = new SpatialMatch(SpatialQuery.ctx.getWorldBounds().getMinY(),
SpatialQuery.ctx.getWorldBounds().getMinX(), SpatialQuery.ctx.getWorldBounds().getMaxY(),
longitude, limit, getSpatialOperation());
return match;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java Fri Sep 6 20:38:19 2013
@@ -73,7 +73,7 @@ public class SpatialSearchUtil {
}
}
- public static Dataset initInMemoryDatasetWithSolrSpatitalIndex() throws IOException{
+ public static Dataset initInMemoryDatasetWithSolrSpatitalIndex() {
SpatialSearchUtil.deleteOldFiles(SOLR_DATA_DIR );
SOLR_INDEX_DIR.mkdirs();
SpatialQuery.init() ;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TS_Spatial.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TS_Spatial.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TS_Spatial.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TS_Spatial.java Fri Sep 6 20:38:19 2013
@@ -35,28 +35,16 @@ package org.apache.jena.query.spatial;
* limitations under the License.
*/
-import org.apache.jena.query.spatial.assembler.TestEntityDefinitionAssembler;
-import org.apache.jena.query.spatial.assembler.TestSpatialDatasetAssembler;
-import org.apache.jena.query.spatial.assembler.TestSpatialIndexLuceneAssembler;
-import org.apache.jena.query.spatial.pfunction.lucene.TestEastPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestIntersectsBoxPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestIsNearByPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestIsWithinBoxPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestIsWithinCirclePFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestNorthPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestSouthPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.lucene.TestWestPFWithLuceneSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestEastPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestIsNearByPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestNorthPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestSouthPFWithEmbeddedSolrSpatialIndex;
-import org.apache.jena.query.spatial.pfunction.solr.TestWestPFWithEmbeddedSolrSpatialIndex;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.query.spatial.assembler.TestEntityDefinitionAssembler ;
+import org.apache.jena.query.spatial.assembler.TestSpatialDatasetAssembler ;
+import org.apache.jena.query.spatial.assembler.TestSpatialIndexLuceneAssembler ;
+import org.apache.jena.query.spatial.pfunction.lucene.* ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
@RunWith(Suite.class)
@SuiteClasses({
@@ -70,18 +58,18 @@ import org.junit.runners.Suite.SuiteClas
TestEastPFWithLuceneSpatialIndex.class,
TestWestPFWithLuceneSpatialIndex.class,
- TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.class,
- TestIsNearByPFWithEmbeddedSolrSpatialIndex.class,
- TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.class,
- TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.class,
- TestNorthPFWithEmbeddedSolrSpatialIndex.class,
- TestSouthPFWithEmbeddedSolrSpatialIndex.class,
- TestEastPFWithEmbeddedSolrSpatialIndex.class,
- TestWestPFWithEmbeddedSolrSpatialIndex.class,
+// TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.class,
+// TestIsNearByPFWithEmbeddedSolrSpatialIndex.class,
+// TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.class,
+// TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.class,
+// TestNorthPFWithEmbeddedSolrSpatialIndex.class,
+// TestSouthPFWithEmbeddedSolrSpatialIndex.class,
+// TestEastPFWithEmbeddedSolrSpatialIndex.class,
+// TestWestPFWithEmbeddedSolrSpatialIndex.class,
TestTDBDatasetWithLuceneSpatialIndex.class,
TestIndexingSpatialDataWithLucene.class,
- TestIndexingSpatialDataWithSolr.class,
+// TestIndexingSpatialDataWithSolr.class,
TestEntityDefinitionAssembler.class,
TestSpatialDatasetAssembler.class,
@@ -90,4 +78,11 @@ import org.junit.runners.Suite.SuiteClas
})
public class TS_Spatial {
+ @BeforeClass public static void beforeClass() {
+ Log.enable("org.apache.jena.query.spatial", "error");
+ }
+ @AfterClass public static void afterClass() {
+ Log.enable("org.apache.jena.query.spatial", "info");
+ }
+
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithLucene.java Fri Sep 6 20:38:19 2013
@@ -20,14 +20,8 @@ package org.apache.jena.query.spatial;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
public class TestIndexingSpatialDataWithLucene extends
AbstractTestIndexingSpatialData {
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestIndexingSpatialDataWithSolr.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial;
-import java.io.IOException;
-
import org.junit.After;
import org.junit.Before;
@@ -27,7 +25,7 @@ public class TestIndexingSpatialDataWith
AbstractTestIndexingSpatialData {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java Fri Sep 6 20:38:19 2013
@@ -19,8 +19,6 @@
package org.apache.jena.query.spatial.assembler;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.jena.atlas.logging.Log;
import org.apache.jena.query.spatial.EntityDefinition;
import org.apache.jena.query.spatial.SpatialIndexException;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestSpatialIndexLuceneAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestSpatialIndexLuceneAssembler.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestSpatialIndexLuceneAssembler.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestSpatialIndexLuceneAssembler.java Fri Sep 6 20:38:19 2013
@@ -24,7 +24,6 @@ import org.apache.jena.query.spatial.Spa
import org.junit.Test;
import com.hp.hpl.jena.assembler.Assembler;
-import com.hp.hpl.jena.vocabulary.RDFS;
public class TestSpatialIndexLuceneAssembler extends AbstractTestSpatialAssembler {
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestEastPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestEastPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestEastPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestEastPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,13 +18,12 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
-import java.io.IOException;
+import java.io.IOException ;
-import org.apache.jena.query.spatial.SpatialSearchUtil;
-import org.apache.jena.query.spatial.pfunction.AbstractTestEastPF;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.jena.query.spatial.SpatialSearchUtil ;
+import org.apache.jena.query.spatial.pfunction.AbstractTestEastPF ;
+import org.junit.After ;
+import org.junit.Before ;
/**
* This abstract class defines a setup configuration for a dataset with a Lucene
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIntersectsBoxPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIntersectsBoxPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIntersectsBoxPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIntersectsBoxPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsNearByPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsNearByPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsNearByPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsNearByPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinBoxPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinBoxPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinBoxPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinBoxPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinCirclePFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinCirclePFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinCirclePFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestIsWithinCirclePFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestSouthPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestSouthPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestSouthPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestSouthPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestWestPFWithLuceneSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestWestPFWithLuceneSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestWestPFWithLuceneSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/lucene/TestWestPFWithLuceneSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,7 +18,6 @@
package org.apache.jena.query.spatial.pfunction.lucene;
-import java.io.File;
import java.io.IOException;
import org.apache.jena.query.spatial.SpatialSearchUtil;
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestEastPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestEastPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestEastPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestEastPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -35,7 +33,7 @@ public class TestEastPFWithEmbeddedSolrS
AbstractTestEastPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIntersectsBoxPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -32,7 +30,7 @@ public class TestIntersectsBoxPFWithEmbe
AbstractTestIntersectsBoxPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsNearByPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsNearByPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsNearByPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsNearByPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -30,7 +28,7 @@ import org.junit.Before;
public class TestIsNearByPFWithEmbeddedSolrSpatialIndex extends AbstractTestIsNearByPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinBoxPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,9 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -36,7 +33,7 @@ public class TestIsWithinBoxPFWithEmbedd
AbstractTestIsWithinBoxPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -30,7 +28,7 @@ import org.junit.Before;
public class TestIsWithinCirclePFWithEmbeddedSolrSpatialIndex extends AbstractTestIsWithinCirclePF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestNorthPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestNorthPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestNorthPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestNorthPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,9 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -36,7 +33,7 @@ public class TestNorthPFWithEmbeddedSolr
AbstractTestNorthPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestSouthPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestSouthPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestSouthPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestSouthPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -35,7 +33,7 @@ public class TestSouthPFWithEmbeddedSolr
AbstractTestSouthPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}
Modified: jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestWestPFWithEmbeddedSolrSpatialIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestWestPFWithEmbeddedSolrSpatialIndex.java?rev=1520689&r1=1520688&r2=1520689&view=diff
==============================================================================
--- jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestWestPFWithEmbeddedSolrSpatialIndex.java (original)
+++ jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr/TestWestPFWithEmbeddedSolrSpatialIndex.java Fri Sep 6 20:38:19 2013
@@ -18,8 +18,6 @@
package org.apache.jena.query.spatial.pfunction.solr;
-import java.io.IOException;
-
import org.apache.jena.query.spatial.SpatialIndexSolr;
import org.apache.jena.query.spatial.SpatialQuery;
import org.apache.jena.query.spatial.SpatialSearchUtil;
@@ -35,7 +33,7 @@ public class TestWestPFWithEmbeddedSolrS
AbstractTestWestPF {
@Before
- public void init() throws IOException {
+ public void init() {
dataset = SpatialSearchUtil.initInMemoryDatasetWithSolrSpatitalIndex();
}