Merge from ngageoint

.travis.yml

@@ -0,0 +1,25 @@
+sudo: false
+language: java
+jdk:
+- oraclejdk8
+cache:
+  directories:
+  - "$HOME/.m2"
+env:
+  matrix:
+  - MODULES='titan-test'
+install: "mvn install -DskipTests=true -B -pl ${MODULES} -am"
+script: "mvn verify -pl ${MODULES} ${ARGS}"
+before_deploy:
+  - mvn package -DskipTests -Dgpg.skip=true -Paurelius-release
+  - export TITAN_DIST_ZIP="$(ls titan-dist/titan-dist-hadoop-2/target/titan-*-hadoop2.zip)"
+  - echo "Deploying $TITAN_DIST_ZIP to GitHub releases"
+deploy:
+  provider: releases
+  api_key:
+    secure: FFkzMiTgocwydagUbRh65BoBnvzWG6y4gSAQZKdD830MANatgn4R6hnA+3iAidPuv4gS5ERyukQwrgqGLXF5Anaj4EL+aw37QFVGSkr5gCldlWg52fFOAZitTlflO3uXNHWq6FhqAWC8wf7rzpbV9j9RjnEe65UEfGFw/0YtHdRpHXbVqKspCTLv82vghdGjVyL7gR3nJTDYIb6hFx3n7BQuiNmdOOt2K7/vKlwY8oNMtBCgJ4C9G0IrKQ45WN1+dtTNiNMg928k2vI8QClD0VWwhZLP6oRWziaXOi+5dldCLGLGPxdrxJrYwY2I7+4EjRNqMEZqsavm1vxi/Eyc2pv/DnfKXibqpKh8B3oBG0A5J7GYd4cEooPLLHvqSZAkwSCWrlAvwUhtFZCrvnSOrnT1e3DpvzaAlcRbvz856x1t9R8chyAx3SMlT1t/Dyvk9o9pRguGellkvFwd/MfOaIL6MKeznavMwUJpEVJnnYmCQdcNbVZjEJnOvX7BCo/6Ut9ZD8JamSFKTCTVyufHR2NfO4JWFn9p/y85wj08fmbQ2Vs/Jw19zbPj8MlyIpac8O8LHKZUkFvCe1QpU34FWmKJlIt6SZBeoDgF2k04PO4TB8D/hFFsuuV59Y155mdx7WNmpp0AhKeH+i9CywrvnUFoSURJLS4h9pEVnd1FX4w=
+  file_glob: true
+  skip_cleanup: true
+  file: "$TITAN_DIST_ZIP"
+  on:
+    tags: true

README.md

@@ -0,0 +1,25 @@
+## About
+
+This is a fork of [Titan](https://github.com/thinkaurelius/titan), currently based on the `titan11` branch
+
+<a href="https://travis-ci.org/ngageoint/titan">
+	<img alt="Travis-CI test status" 
+	     src="https://travis-ci.org/ngageoint/titan.svg?branch=master"/>
+</a>
+
+## Downloads
+
+Binaries are available for download on the [GitHub Releases](https://github.com/ngageoint/titan/releases) page. Note only `hadoop2` binaries are provided.
+
+## Documentation
+
+Original documentation is available on Titan [project](http://titandb.io/) and [GitHub](https://github.com/thinkaurelius/titan) pages. Updated documentation for this fork must currently be built from source (see `titan-doc/target/docs/chunk/index.html`).
+
+```bash
+mvn clean install -pl titan-doc
+```
+
+## Contributing
+
+Software source code previously released under an open source license and then modified by NGA staff is considered a "joint work" (see 17 USC 101); it is partially copyrighted, partially public domain, and as a whole is protected by the copyrights of the non-government authors and must be released according to the terms of the original open source license.
+

docs/elasticsearch.txt

@@ -11,7 +11,7 @@ Elasticsearch is a flexible and powerful open source, distributed, real-time sea
 Titan supports http://elasticsearch.org[Elasticsearch] as an index backend.  Here are some of the Elasticsearch features supported by Titan:
 
 * *Full-Text*: Supports all `Text` predicates to search for text properties that matches a given word, prefix or regular expression.
-* *Geo*: Supports the `Geo.WITHIN` condition to search for points that fall within a given circle. Only supports points for indexing and circles for querying.
+* *Geo*: Supports all `Geo` predicates to search for geo properties that are intersecting, within, disjoint to or contained in a given query geometry. Supports points, lines and polygons for indexing. Supports circles, boxes and polygons for querying point properties and all shapes for querying non-point properties.
 * *Numeric Range*: Supports all numeric comparisons in `Compare`.
 * *Flexible Configuration*: Supports embedded or remote operation, custom transport and discovery, and open-ended settings customization.
 * *TTL*: Supports automatically expiring indexed elements.
@@ -404,7 +404,7 @@ Classpath or Field errors
 When you see exception referring to lucene implementation details, make sure you don't have a conflicting version of Lucene on the classpath. Exception may look like this:
 
 [source, text]
-java.lang.NoSuchFieldError: LUCENE_4_10_4
+java.lang.NoSuchFieldError: LUCENE_5_5_2
 
 Optimizing Elasticsearch
 ~~~~~~~~~~~~~~~~~~~~~~~~

docs/hadoop.txt

@@ -85,6 +85,7 @@ giraph.maxMessagesInMemory=100000
 spark.master=local[*]
 spark.executor.memory=1g
 spark.serializer=org.apache.spark.serializer.KryoSerializer
+spark.kryo.registrator=com.thinkaurelius.titan.hadoop.serialize.TitanKryoRegistrator
 ----
 
 [source, gremlin]

docs/lucene.txt

@@ -27,7 +27,7 @@ Feature Support
 ~~~~~~~~~~~~~~~
 
 * *Full-Text*: Supports all `Text` predicates to search for text properties that matches a given word, prefix or regular expression.
-* *Geo*: Supports the `Geo.WITHIN` condition to search for points that fall within a given geographic shape. Only supports points for indexing and circles and boxes for querying.
+* *Geo*: Supports `Geo` predicates to search for geo properties that are intersecting, within, or contained in a given query geometry. Supports points, lines and polygons for indexing. Supports circles and boxes for querying point properties and all shapes for querying non-point properties.
 * *Numeric Range*: Supports all numeric comparisons in `Compare`.
 * *Temporal*: Nanosecond granularity temporal indexing.
 

docs/searchpredicates.txt

@@ -34,8 +34,14 @@ See <<text-search>> for more information about full-text and string search.
 Geo Predicate
 ~~~~~~~~~~~~~
 
-The `Geo` enum specifies the geo-location predicate `geoWithin` which holds true if one geometric object contains the other.
+The `Geo` enum specifies geo-location predicates.
 
+* `geoIntersect` which holds true if the two geometric objects have at least one point in common (opposite of `geoDisjoint`).
+* `geoWithin` which holds true if one geometric object contains the other.
+* `geoDisjoint` which holds true if the two geometric objects have no points in common (opposite of `geoIntersect`).
+* `geoContains` which holds true if one geometric object is contained by the other.
+
+See <<geo-search>> for more information about geo search.
 
 Query Examples
 ~~~~~~~~~~~~~~
@@ -88,7 +94,7 @@ Additional data types will be supported in the future.
 
 Geoshape Data Type
 ~~~~~~~~~~~~~~~~~~
-The Geoshape data type supports representing a point, circle or box. However all index backends currently only support indexing points.
+The Geoshape data type supports representing a point, circle, box, line, polygon, multi-point, multi-line and multi-polygon. Index backends currently support indexing points, lines and polygons. Indexing multi-point, multi-line and multi-polygon properties has not been tested.
 Geospatial index lookups are only supported via mixed indexes.
 
 To construct a Geoshape use the following methods:
@@ -100,8 +106,14 @@ Geoshape.point(37.97, 23.72)
 Geoshape.circle(37.97, 23.72, 50)
 //SW lat, SW lng, NE lat, NE lng
 Geoshape.box(37.97, 23.72, 38.97, 24.72)
+//lat1,lng1,lat2,lng2,...
+Geoshape.line(37.97, 23.72, 37.97, 24.72, 38.97, 24.72, 38.97, 23.72)
+Geoshape.polygon(37.97, 23.72, 37.97, 24.72, 38.97, 24.72, 38.97, 23.72, 37.97, 23.72)
+
+Additional Geoshape constructors for building lines and polygons from a list of coordinate pairs, Spatial4j Shape or JTS Geometry are also available.
+Note that, unlike above, the coordinate order is (lon,lat) when providing a list of coordinate pairs.
 
-In addition when importing a graph via GraphSON Point may be represented by:
+In addition, when importing a graph via GraphSON the geometry may be represented by GeoJSON:
 [source, java]
  //string
 "37.97, 23.72"
@@ -124,7 +136,7 @@ In addition when importing a graph via GraphSON Point may be represented by:
   "coordinates": [125.6, 10.1]
 }
 
-link:http://geojson.org/[GeoJSON] may be specified as Point, Circle or Polygon. However polygons must form a box.
+link:http://geojson.org/[GeoJSON] may be specified as Point, Circle, LineString or Polygon. Polygons must be closed.
 Note that unlike the Titan API GeoJSON specifies coordinates as lng lat.
 
 Collections

docs/solr.txt

@@ -9,7 +9,7 @@ Solr is the popular, blazing fast open source enterprise search platform from th
 Titan supports http://lucene.apache.org/solr/[Solr] as an index backend.  Here are some of the Solr features supported by Titan:
 
 * *Full-Text*: Supports all `Text` predicates to search for text properties that matches a given word, prefix or regular expression.
-* *Geo*: Supports the `Geo.WITHIN` condition to search for points that fall within a given circle. Only supports points for indexing and circles for querying.
+* *Geo*: Supports all `Geo` predicates to search for geo properties that are intersecting, within, disjoint to or contained in a given query geometry. Supports points, lines and polygons for indexing. Supports circles, boxes and polygons for querying point properties and all shapes for querying non-point properties.
 * *Numeric Range*: Supports all numeric comparisons in `Compare`.
 * *TTL*: Supports automatically expiring indexed elements.
 * *Temporal*: Millisecond granularity temporal indexing.

docs/textsearch.txt

@@ -84,8 +84,32 @@ summary = mgmt.makePropertyKey('booksummary').dataType(String.class).make()
 mgmt.buildIndex('booksBySummary', Vertex.class).addKey(summary, Mapping.TEXTSTRING.asParameter()).buildMixedIndex("search")
 mgmt.commit()
 
+
 Note that the data will be stored in the index twice, once for exact matching and once for fuzzy matching.
 
+
+[[geo-search]]
+Geo Mapping
+~~~~~~~~~~~
+
+By default, Titan supports indexing geo properties with point type and querying geo properties by circle or box. To index a non-point geo property with support for querying by any geoshape type, specify the mapping as `Mapping.PREFIX_TREE`:
+
+[source, gremlin]
+mgmt = graph.openManagement()
+name = mgmt.makePropertyKey('border').dataType(Geoshape.class).make()
+mgmt.buildIndex('borderIndex', Vertex.class).addKey(name, Mapping.PREFIX_TREE.asParameter()).buildMixedIndex("search")
+mgmt.commit()
+
+Additional parameters can be specified to tune the configuration of the underlying prefix tree mapping. These optional parameters include the number of levels used in the prefix tree as well as the associated precision.
+
+[source, gremlin]
+mgmt = graph.openManagement()
+name = mgmt.makePropertyKey('border').dataType(Geoshape.class).make()
+mgmt.buildIndex('borderIndex', Vertex.class).addKey(name, Mapping.PREFIX_TREE.asParameter(), Parameter.of("index-geo-max-levels", 18), Parameter.of("index-geo-dist-error-pct", 0.0125)).buildMixedIndex("search")
+mgmt.commit()
+
+Note that some indexing backends (e.g. Solr) may require additional external schema configuration to support and tune indexing non-point properties.
+
 Field Mapping
 ~~~~~~~~~~~~~
 

pom.xml

@@ -7,7 +7,7 @@
     </parent>
     <groupId>com.thinkaurelius.titan</groupId>
     <artifactId>titan</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.2g-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>2.2.1</maven>
@@ -64,7 +64,7 @@
     </scm>
     <properties>
         <titan.compatible.versions />
-        <tinkerpop.version>3.1.1-incubating</tinkerpop.version>
+        <tinkerpop.version>3.2.3</tinkerpop.version>
         <junit.version>4.12</junit.version>
         <mrunit.version>1.1.0</mrunit.version>
         <cassandra.version>2.1.9</cassandra.version>
@@ -75,7 +75,7 @@
         <slf4j.version>1.7.12</slf4j.version>
         <httpcomponents.version>4.4.1</httpcomponents.version>
         <hadoop1.version>1.2.1</hadoop1.version>
-        <hadoop2.version>2.7.1</hadoop2.version>
+        <hadoop2.version>2.7.2</hadoop2.version>
         <hbase094.version>0.94.25</hbase094.version>
         <hbase096.core.version>0.96.2</hbase096.core.version>
         <hbase096.version>${hbase096.core.version}-hadoop2</hbase096.version>
@@ -84,15 +84,15 @@
         <hbase100.core.version>1.0.2</hbase100.core.version>
         <hbase100.version>${hbase100.core.version}</hbase100.version>
         <jackson1.version>1.9.2</jackson1.version>
-        <jackson2.version>2.4.4</jackson2.version>
+        <jackson2.version>2.6.6</jackson2.version>
         <!-- ES depends on Lucene.  This ES dependency can affect the
              version used by the titan-lucene module.  When updating
              the ES version, also consider the version of Lucene, and
              vice-versa. -->
-        <lucene.version>4.10.4</lucene.version>
-        <elasticsearch.version>1.5.1</elasticsearch.version>
+        <lucene.version>5.5.2</lucene.version>
+        <elasticsearch.version>2.4.2</elasticsearch.version>
         <commons.beanutils.version>1.7.0</commons.beanutils.version>
-        <joda.version>1.6.2</joda.version>
+        <joda.version>2.8.2</joda.version>
         <concurrentlinkedhashmap.version>1.3</concurrentlinkedhashmap.version>
         <antlr2.version>2.7.7</antlr2.version>
         <antlr.version>3.2</antlr.version>
@@ -249,6 +249,13 @@
                         </excludes>
                         <excludedGroups>${test.excluded.groups}</excludedGroups>
                         <skip>${test.skip.default}</skip>
+                        <!-- Use log4j.properties from module test resources -->
+                        <systemProperties>
+                            <property>
+                                <name>log4j.configuration</name>
+                                <value>file:target/test-classes/log4j.properties</value>
+                            </property>
+                        </systemProperties>
                     </configuration>
                     <executions>
                         <execution>
@@ -275,13 +282,25 @@
                                     <exclude>**/*</exclude>
                                 </excludes> -->
                                 <skipTests>${test.skip.tp}</skipTests>
+                                <systemPropertyVariables>
+                                    <build.dir>${project.build.directory}</build.dir>
+                                </systemPropertyVariables>
                             </configuration>
                        </execution>
                     </executions>
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>2.15</version>
+                    <configuration>
+                        <!-- Use log4j.properties from module test resources -->
+                        <systemProperties>
+                            <property>
+                                <name>log4j.configuration</name>
+                                <value>file:target/test-classes/log4j.properties</value>
+                            </property>
+                        </systemProperties>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
@@ -454,6 +473,11 @@
                 <artifactId>jackson-annotations</artifactId>
                 <version>${jackson2.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-scala_2.10</artifactId>
+                <version>${jackson2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
@@ -798,7 +822,7 @@
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
-                <version>1.2</version>
+                <version>1.3.1</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.netty</groupId>
@@ -808,14 +832,14 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
-                <version>3.6.6.Final</version>
+                <version>3.10.5.Final</version>
             </dependency>
 
             <!-- Spatial4j -->
             <dependency>
                 <groupId>com.spatial4j</groupId>
                 <artifactId>spatial4j</artifactId>
-                <version>0.4.1</version>
+                <version>0.5</version>
             </dependency>
 
             <!-- Package prefix is org.apache.commons.httpclient -->
@@ -1169,11 +1193,6 @@
 
             <dependencyManagement>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.apache.curator</groupId>
-                        <artifactId>curator-recipes</artifactId>
-                        <version>${hadoop2.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.apache.hadoop</groupId>
                         <artifactId>hadoop-annotations</artifactId>

titan-all/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.thinkaurelius.titan</groupId>
         <artifactId>titan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.2g-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>titan-all</artifactId>

titan-berkeleyje/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.thinkaurelius.titan</groupId>
         <artifactId>titan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.2g-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>titan-berkeleyje</artifactId>

titan-berkeleyje/src/test/java/com/thinkaurelius/titan/blueprints/BerkeleyGraphComputerProvider.java

@@ -19,7 +19,8 @@ public class BerkeleyGraphComputerProvider extends AbstractTitanGraphComputerPro
 
     @Override
     public ModifiableConfiguration getTitanConfiguration(String graphName, Class<?> test, String testMethodName) {
-        ModifiableConfiguration config = BerkeleyStorageSetup.getBerkeleyJEConfiguration(StorageSetup.getHomeDir(graphName));
+        ModifiableConfiguration config = super.getTitanConfiguration(graphName, test, testMethodName);
+        config.setAll(BerkeleyStorageSetup.getBerkeleyJEConfiguration(StorageSetup.getHomeDir(graphName)).getAll());
         config.set(GraphDatabaseConfiguration.IDAUTHORITY_WAIT, Duration.ofMillis(20));
         config.set(GraphDatabaseConfiguration.STORAGE_TRANSACTIONAL,false);
         return config;

titan-cassandra/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.thinkaurelius.titan</groupId>
         <artifactId>titan</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.2g-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>titan-cassandra</artifactId>

titan-cassandra/src/test/java/com/thinkaurelius/titan/blueprints/thrift/ThriftGraphComputerProvider.java

@@ -2,7 +2,6 @@
 
 import com.thinkaurelius.titan.CassandraStorageSetup;
 import com.thinkaurelius.titan.blueprints.AbstractTitanGraphComputerProvider;
-import com.thinkaurelius.titan.blueprints.AbstractTitanGraphProvider;
 import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
 import com.thinkaurelius.titan.graphdb.olap.computer.FulgoraGraphComputer;
 import org.apache.tinkerpop.gremlin.GraphProvider;
@@ -16,7 +15,9 @@ public class ThriftGraphComputerProvider extends AbstractTitanGraphComputerProvi
     @Override
     public ModifiableConfiguration getTitanConfiguration(String graphName, Class<?> test, String testMethodName) {
         CassandraStorageSetup.startCleanEmbedded();
-        return CassandraStorageSetup.getCassandraThriftConfiguration(graphName);
+        ModifiableConfiguration config = super.getTitanConfiguration(graphName, test, testMethodName);
+        config.setAll(CassandraStorageSetup.getCassandraThriftConfiguration(graphName).getAll());
+        return config;
     }
 
 }