updated packages, TitanBlueprintsTransaction can deduce a long from a…

… number. Updated distribution.xml, pom.xml, and README.
twilmes · May 30, 2012 · 5c3c514 · 5c3c514
1 parent 4d039bf
commit 5c3c514
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 45 deletions.
diff --git a/README.textile b/README.textile
@@ -1,6 +1,6 @@
 !https://github.com/thinkaurelius/titan/raw/master/doc/images/titan-logo.png!
 
-Titan is a distributed "graph database":http://en.wikipedia.org/wiki/Graph_database optimized for processing massive-scale graphs represented over a machine cluster. Titan separates the concerns of graph query and manipulation from storing the graph on disk, delegating that concern to an extensible set of NoSQL solutions.
+Titan is a distributed "graph database":http://en.wikipedia.org/wiki/Graph_database optimized for processing massive-scale graphs represented over a machine cluster. Titan separates the concerns of graph processing and manipulation from storing the graph on disk, delegating that concern to an extensible set of persistence solutions.
 
 h2. Features
 

diff --git a/pom.xml b/pom.xml
@@ -10,9 +10,8 @@
     <artifactId>titan</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-
     <name>Titan: A Highly Scalable, Distributed Graph Database</name>
-    <url>http://titan.thinkaurelius.com</url>
+    <url>http://thinkaurelius.github.com/titan/</url>
     <description>
         Titan is a highly scalable, distributed graph database.
     </description>
@@ -80,11 +79,13 @@
             <groupId>com.tinkerpop.blueprints</groupId>
             <artifactId>blueprints-test</artifactId>
             <version>2.1.0-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.tinkerpop.gremlin</groupId>
             <artifactId>gremlin-groovy</artifactId>
             <version>2.1.0-SNAPSHOT</version>
+            <!--<scope>provided</scope>-->
         </dependency>
         <!-- Utility -->
         <dependency>
@@ -271,8 +272,8 @@
                 <configuration>
                     <attach>false</attach>
                     <descriptors>
-                        <descriptor>src/assembly/distribution.xml</descriptor>
                         <descriptor>src/assembly/standalone.xml</descriptor>
+                        <descriptor>src/assembly/distribution.xml</descriptor>
                         <!--<descriptor>src/assembly/archive-with-deps.xml</descriptor> -->
                     </descriptors>
                     <finalName>${project.artifactId}-${project.version}</finalName>

diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
@@ -8,13 +8,12 @@
                 <include>pom.xml</include>
             </includes>
         </fileSet>
-        <!--<fileSet>
+        <fileSet>
             <fileMode>0775</fileMode>
             <includes>
-                <include>gremlin-groovy.sh</include>
-                <include>gremlin-groovy.bat</include>
+                <include>gremlin.sh</include>
             </includes>
-        </fileSet>-->
+        </fileSet>
         <fileSet>
             <directory>src</directory>
         </fileSet>
@@ -29,6 +28,10 @@
         </fileSet>
     </fileSets>
     <files>
+        <file>
+            <source>data/graph-of-the-gods.xml</source>
+            <outputDirectory>data</outputDirectory>
+        </file>
         <file>
             <source>LICENSE.txt</source>
             <outputDirectory>/</outputDirectory>

diff --git a/src/main/java/com/thinkaurelius/titan/core/package.html b/src/main/java/com/thinkaurelius/titan/core/package.html
@@ -2,22 +2,10 @@
 <html>
 <head></head>
 <body>
-Core Interfaces for interacting with the graph database.
+Core interfaces for interacting with the graph database.
 
 <h3>
 Project Name: Titan Graph Database
 </h3>
-
-<p>
-Copyright (c) 2012, Matthias Broecheler (http://www.matthiasb.com); All right reserved.
-</p>
-
-<p>
-When using the software, the user agrees to cite the following corresponding paper:<br /><br />
-<i>COSI: Cloud Oriented Subgraph Identification in Massive Social Networks.</i> <br />
-Matthias Br&ouml;cheler, Andrea Pugliese, and V.S. Subrahmanian. <br />
-In the 2010 International Conference on Advances in Social Networks Analysis <br />
-			and Mining (ASONAM), Odense, Denmark, August 2010. 
-</p>
 </body>
 </html>
diff --git a/src/main/java/com/thinkaurelius/titan/diskstorage/package.html b/src/main/java/com/thinkaurelius/titan/diskstorage/package.html
@@ -8,27 +8,5 @@ <h3>
 Project Name: Titan Graph Database
 </h3>
 
-<p>
-Copyright (c) 2012, Matthias Broecheler (me@matthiasb.com); All right reserved.
-</p>
-
-<p>
-This software is distributed for research and evaluation purposes only. No further
-re-distribution is permitted without consent by the copyright holder.
-Please see the license for further details.
-</p>
-
-<p>
-The code, interfaces, and documentation in this package are proprietary and belong to
- Matthias Broecheler.
-</p>
-
-<p>
-When using the software, the user agrees to cite the following corresponding paper:<br /><br />
-<i>Titan: Cloud Oriented Subgraph Identification in Massive Social Networks.</i> <br />
-Matthias Br&ouml;cheler, Andrea Pugliese, and V.S. Subrahmanian. <br />
-In the 2010 International Conference on Advances in Social Networks Analysis <br />
-			and Mining (ASONAM), Odense, Denmark, August 2010. 
-</p>
 </body>
 </html>
diff --git a/src/main/java/com/thinkaurelius/titan/graphdb/blueprints/TitanBlueprintsTransaction.java b/src/main/java/com/thinkaurelius/titan/graphdb/blueprints/TitanBlueprintsTransaction.java
@@ -46,8 +46,8 @@ public Vertex addVertex(Object id) {
     @Override
     public Vertex getVertex(Object id) {
         if (id==null) throw ExceptionFactory.vertexIdCanNotBeNull();
-        if (!(id instanceof Long)) return null;
-        long vid = ((Long)id).longValue();
+        if (!(id instanceof Number)) return null;
+        long vid = ((Number)id).longValue();
         if (vid<=0) return null;
         return getVertex(vid);
     }