Skip to content

Commit

Permalink
Blueprints 1.2 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@okram
okram committed Feb 28, 2012
1 parent 7674e0d commit c79e1de
Show file tree
Hide file tree
Showing 45 changed files with 2,168 additions and 142 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.textile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ Blueprints: A Property Graph Model Interface

!https://github.com/tinkerpop/blueprints/raw/master/doc/images/blueprints-bluesky.png!

h3. Version 1.2 (Blue Sky -- NOT OFFICIALLY RELEASED YET)
h3. Version 1.2 (Blue Sky -- February 28, 2012)

```xml
<dependency>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints-core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
</dependency>
```

* Fixed @Neo4jGraph@ index object caching bug which was made salient with multiple threads
* Fixed @SailGraph@ to now commit transactions on shutdown
* Updated @Neo4jGraph@ to use @GlobalGraphOperations@ methods for @getAllNodes()@ and @getAllRelationships()@
* Bumped to support Neo4j 1.6
* Bumped to support Neo4j 1.6.1
* Fixed "fresh"-constructor bug in @Neo4jGraph@
* Added method support for named graphs in @SailGraph@
* Fixed named graph bug in @SailGraph@
Expand Down
15 changes: 2 additions & 13 deletions blueprints-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-core</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<url>http://blueprints.tinkerpop.com</url>
<name>Blueprints-Core</name>
Expand Down Expand Up @@ -78,17 +78,6 @@
<tarLongFileMode>warn</tarLongFileMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 2 additions & 13 deletions blueprints-dex-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-dex-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-DexGraph</name>
<description>Blueprints property graph implementation for the DEX graph database</description>
Expand Down Expand Up @@ -73,17 +73,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 2 additions & 13 deletions blueprints-graph-jung/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-graph-jung</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-GraphJung</name>
<description>Blueprints property graphs outplementation for the JUNG (Java Universal Network/Graph Framework)
Expand Down Expand Up @@ -71,17 +71,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 2 additions & 13 deletions blueprints-graph-sail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-graph-sail</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-GraphSail</name>
<description>Blueprints property graphs outplementation for Sesame RDS Sail</description>
Expand Down Expand Up @@ -139,17 +139,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
21 changes: 5 additions & 16 deletions blueprints-neo4j-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-neo4j-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-Neo4jGraph</name>
<description>Blueprints property graph implementation for the Neo4j graph database</description>
Expand All @@ -22,19 +22,19 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-ha</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-management</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -97,17 +97,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
17 changes: 3 additions & 14 deletions blueprints-neo4jbatch-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-neo4jbatch-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-Neo4jBatchGraph</name>
<description>Blueprints property graph implementation for the Neo4j batch inserter</description>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<type>pom</type>
</dependency>
<!-- TESTING -->
Expand Down Expand Up @@ -92,17 +92,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 2 additions & 13 deletions blueprints-orient-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-orient-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-OrientGraph</name>
<description>Blueprints property graph implementation for the OrientDB graph database</description>
Expand Down Expand Up @@ -89,17 +89,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
15 changes: 2 additions & 13 deletions blueprints-rexster-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-rexster-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-RexsterGraph</name>
<description>Blueprints property graph implementation for Rexster</description>
Expand Down Expand Up @@ -68,17 +68,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
4 changes: 2 additions & 2 deletions ...-rexster-graph/src/main/java/com/tinkerpop/blueprints/pgm/impls/rexster/RexsterIndex.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ else if (element instanceof Edge)
clazz = RexsterTokens.EDGE;
else
throw new RuntimeException("The provided element is not a legal vertex or edge: " + element);
RestHelper.post(this.graph.getGraphURI() + RexsterTokens.SLASH_INDICES_SLASH + RestHelper.encode(this.indexName) + RexsterTokens.QUESTION + RexsterTokens.KEY_EQUALS + key + RexsterTokens.AND + RexsterTokens.VALUE_EQUALS + RestHelper.uriCast(value) + RexsterTokens.AND + RexsterTokens.CLASS_EQUALS + clazz + RexsterTokens.AND + RexsterTokens.ID_EQUALS + RestHelper.encode(element.getId()));
RestHelper.put(this.graph.getGraphURI() + RexsterTokens.SLASH_INDICES_SLASH + RestHelper.encode(this.indexName) + RexsterTokens.QUESTION + RexsterTokens.KEY_EQUALS + key + RexsterTokens.AND + RexsterTokens.VALUE_EQUALS + RestHelper.uriCast(value) + RexsterTokens.AND + RexsterTokens.CLASS_EQUALS + clazz + RexsterTokens.AND + RexsterTokens.ID_EQUALS + RestHelper.encode(element.getId()));
}

public String getIndexName() {
Expand Down Expand Up @@ -85,4 +85,4 @@ public long count(final String key, final Object value) {
final JSONObject countJson = RestHelper.get(this.graph.getGraphURI() + RexsterTokens.SLASH_INDICES_SLASH + RestHelper.encode(this.indexName) + RexsterTokens.SLASH_COUNT + RexsterTokens.QUESTION + RexsterTokens.KEY_EQUALS + key + RexsterTokens.AND + RexsterTokens.VALUE_EQUALS + RestHelper.uriCast(value));
return countJson.optLong("totalSize");
}
}
}
16 changes: 15 additions & 1 deletion ...xster-graph/src/main/java/com/tinkerpop/blueprints/pgm/impls/rexster/util/RestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
public class RestHelper {

private static final String POST = "POST";
private static final String PUT = "PUT";
private static final String DELETE = "DELETE";

public static JSONObject get(final String uri) {
Expand Down Expand Up @@ -121,6 +122,19 @@ public static void delete(final String uri) {
}
}

public static void put(final String uri) {
try {
final URL url = new URL(uri);
final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestProperty(RexsterTokens.ACCEPT, RexsterTokens.APPLICATION_REXSTER_TYPED_JSON);
connection.setRequestMethod(PUT);
final InputStreamReader reader = new InputStreamReader(connection.getInputStream());
reader.close();
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
}

public static Object typeCast(final String type, final Object value) {
if (type.equals(RexsterTokens.STRING))
return value.toString();
Expand Down Expand Up @@ -174,4 +188,4 @@ public static String encode(Object id) {
else
return id.toString();
}
}
}
15 changes: 2 additions & 13 deletions blueprints-sail-graph/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.tinkerpop.blueprints</groupId>
<artifactId>blueprints</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>blueprints-sail-graph</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<packaging>jar</packaging>
<name>Blueprints-SailGraph</name>
<description>Blueprints property graph implementation for Sesame RDF Sail</description>
Expand Down Expand Up @@ -122,17 +122,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit c79e1de

Please sign in to comment.