upgrade to 2.0.1

DesktopNeo4j/manifest.mf

@@ -1,7 +1,7 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.gephi.desktop.neo4j
-OpenIDE-Module-Layer: org/gephi/desktop/neo4j/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/neo4j/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.2
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.gephi.desktop.neo4j
+OpenIDE-Module-Layer: org/gephi/desktop/neo4j/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/neo4j/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0.2
+

DesktopNeo4j/nbproject/project.properties

@@ -1,5 +1,5 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../agpl-3.0.txt
-nbm.module.author=Gephi.org
-nbm.needs.restart=true
+javac.source=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../agpl-3.0.txt
+nbm.module.author=Gephi.org
+nbm.needs.restart=true

DesktopNeo4j/src/org/gephi/desktop/neo4j/ui/util/Neo4jUtils.java

@@ -26,7 +26,7 @@ License, or (at your option) any later version.
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.TransactionFailureException;
-import org.neo4j.kernel.EmbeddedGraphDatabase;
+import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 
 /**
  *
@@ -40,7 +40,7 @@ private Neo4jUtils() {
     public static GraphDatabaseService localDatabase(File neo4jDirectory) throws Neo4jStoreAlreadyInUseException {
 
         try {
-            return new EmbeddedGraphDatabase(neo4jDirectory.getAbsolutePath());
+            return new GraphDatabaseFactory().newEmbeddedDatabase(neo4jDirectory.getAbsolutePath());
         }
         catch (TransactionFailureException e) {
             if (e.getCause() instanceof IllegalStateException)

Neo4jPlugin/manifest.mf

@@ -1,6 +1,6 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.gephi.neo4j.plugin
-OpenIDE-Module-Localizing-Bundle: org/gephi/neo4j/plugin/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.3
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.gephi.neo4j.plugin
+OpenIDE-Module-Localizing-Bundle: org/gephi/neo4j/plugin/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0.3
+

Neo4jPlugin/nbproject/project.properties

@@ -1,5 +1,5 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../agpl-3.0.txt
-nbm.module.author=Gephi.org
-nbm.needs.restart=true
+javac.source=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../agpl-3.0.txt
+nbm.module.author=Gephi.org
+nbm.needs.restart=true

Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/GraphModelImportConverter.java

@@ -41,9 +41,10 @@ License, or (at your option) any later version.
 import org.gephi.project.api.WorkspaceListener;
 import org.gephi.project.api.WorkspaceProvider;
 import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
-import org.neo4j.jmx.Primitives;
-import org.neo4j.management.Neo4jManager;
+import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.impl.core.NodeManager;
 import org.openide.util.Lookup;
 
 /**
@@ -264,9 +265,8 @@ public static class Neo4jGraphModel {
 
         public Neo4jGraphModel(GraphDatabaseService graphDb) {
             this.graphDb = graphDb;
-
-            int numberOfNeo4jNodeIds = (int) Neo4jManager.get().getPrimitivesBean().getNumberOfNodeIdsInUse();
-
+            NodeManager nodeManager = ((GraphDatabaseAPI)graphDb).getDependencyResolver().resolveDependency(NodeManager.class);
+            int numberOfNeo4jNodeIds = (int) nodeManager.getNumberOfIdsInUse(Node.class);
             this.neo4jToGephiNodeMap = new TLongIntHashMap(numberOfNeo4jNodeIds, 1f);
             this.gephiToNeo4jNodeMap = new TIntLongHashMap(numberOfNeo4jNodeIds, 1f);
         }

Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jImporterImpl.java

@@ -38,7 +38,6 @@ License, or (at your option) any later version.
 import org.neo4j.graphdb.traversal.Evaluators;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.graphdb.traversal.Traverser;
-import org.neo4j.kernel.Traversal;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
@@ -105,7 +104,7 @@ public void importDatabase(GraphDatabaseService graphDB, long startNodeId, Trave
         NodeReturnFilter nodeReturnFilter = null;
 
         if (startNodeId != NO_START_NODE) {
-            TraversalDescription traversalDescription = Traversal.description();
+            TraversalDescription traversalDescription = graphDB.traversalDescription();
 
             traversalDescription = order.update(traversalDescription);
 
@@ -137,7 +136,7 @@ private void doImport(GraphDatabaseService graphDB, Traverser traverser, NodeRet
             importGraph(graphDB, traverser, nodeReturnFilter);
             transaction.success();
         } finally {
-            transaction.finish();
+            transaction.close();
         }
 
         Progress.finish(progressTicket);

Neo4jWrapper/manifest.mf

@@ -1,5 +1,5 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.gephi.lib.neo4j
-OpenIDE-Module-Localizing-Bundle: org/gephi/lib/neo4j/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.gephi.lib.neo4j
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/neo4j/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.5
+

Neo4jWrapper/nbproject/build-impl.xml

@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.gephi.lib.neo4j-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.gephi.lib.neo4j-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>

Neo4jWrapper/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e0c5ea51
-build.xml.script.CRC32=39b61f62
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e0c5ea51
-nbproject/build-impl.xml.script.CRC32=db29d8c2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
+build.xml.data.CRC32=e0c5ea51
+build.xml.script.CRC32=39b61f62
+build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=a540ecf9
+nbproject/build-impl.xml.script.CRC32=db29d8c2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.62.1

Neo4jWrapper/nbproject/project.properties

@@ -1,6 +1,8 @@
-
-file.reference.geronimo-jta_1.1_spec-1.1.1.jar=release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar
-is.autoload=true
-license.file=agpl-3.0.txt
-nbm.homepage=http://neo4j.org
-nbm.module.author=Neo Technology
+
+file.reference.geronimo-jta_1.1_spec-1.1.1.jar=release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar
+file.reference.neo4j-kernel-2.0.1.jar=release/modules/ext/neo4j-kernel-2.0.1.jar
+is.autoload=true
+javac.source=1.7
+license.file=agpl-3.0.txt
+nbm.homepage=http://neo4j.org
+nbm.module.author=Neo Technology

Neo4jWrapper/nbproject/project.xml

@@ -1,65 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.gephi.lib.neo4j</code-name-base>
-            <suite-component/>
-            <module-dependencies/>
-            <public-packages>
-                <package>org.neo4j.ext.udc</package>
-                <package>org.neo4j.ext.udc.impl</package>
-                <package>org.neo4j.ext.udc.impl.osgi</package>
-                <package>org.neo4j.graphdb</package>
-                <package>org.neo4j.graphdb.event</package>
-                <package>org.neo4j.graphdb.index</package>
-                <package>org.neo4j.graphdb.traversal</package>
-                <package>org.neo4j.helpers</package>
-                <package>org.neo4j.helpers.collection</package>
-                <package>org.neo4j.jmx</package>
-                <package>org.neo4j.jmx.impl</package>
-                <package>org.neo4j.kernel</package>
-                <package>org.neo4j.kernel.impl</package>
-                <package>org.neo4j.kernel.impl.annotations</package>
-                <package>org.neo4j.kernel.impl.batchinsert</package>
-                <package>org.neo4j.kernel.impl.cache</package>
-                <package>org.neo4j.kernel.impl.core</package>
-                <package>org.neo4j.kernel.impl.index</package>
-                <package>org.neo4j.kernel.impl.nioneo.store</package>
-                <package>org.neo4j.kernel.impl.nioneo.xa</package>
-                <package>org.neo4j.kernel.impl.osgi</package>
-                <package>org.neo4j.kernel.impl.persistence</package>
-                <package>org.neo4j.kernel.impl.storemigration</package>
-                <package>org.neo4j.kernel.impl.storemigration.legacystore</package>
-                <package>org.neo4j.kernel.impl.storemigration.monitoring</package>
-                <package>org.neo4j.kernel.impl.transaction</package>
-                <package>org.neo4j.kernel.impl.transaction.xaframework</package>
-                <package>org.neo4j.kernel.impl.traversal</package>
-                <package>org.neo4j.kernel.impl.util</package>
-                <package>org.neo4j.management</package>
-                <package>org.neo4j.management.impl</package>
-                <package>org.neo4j.management.impl.jconsole</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-management-1.9.M04.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-management-1.9.M04.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-jmx-1.9.M04.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-jmx-1.9.M04.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-kernel-1.9.M04.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-kernel-1.9.M04.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-udc-1.9.M04.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-udc-1.9.M04.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/geronimo-jta_1.1_spec-1.1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.gephi.lib.neo4j</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>org.neo4j.graphdb</package>
+                <package>org.neo4j.graphdb.event</package>
+                <package>org.neo4j.graphdb.factory</package>
+                <package>org.neo4j.graphdb.index</package>
+                <package>org.neo4j.graphdb.traversal</package>
+                <package>org.neo4j.helpers</package>
+                <package>org.neo4j.helpers.collection</package>
+                <package>org.neo4j.kernel</package>
+                <package>org.neo4j.kernel.impl</package>
+                <package>org.neo4j.kernel.impl.annotations</package>
+                <package>org.neo4j.kernel.impl.cache</package>
+                <package>org.neo4j.kernel.impl.core</package>
+                <package>org.neo4j.kernel.impl.index</package>
+                <package>org.neo4j.kernel.impl.nioneo.store</package>
+                <package>org.neo4j.kernel.impl.nioneo.xa</package>
+                <package>org.neo4j.kernel.impl.persistence</package>
+                <package>org.neo4j.kernel.impl.storemigration</package>
+                <package>org.neo4j.kernel.impl.storemigration.legacystore</package>
+                <package>org.neo4j.kernel.impl.storemigration.monitoring</package>
+                <package>org.neo4j.kernel.impl.transaction</package>
+                <package>org.neo4j.kernel.impl.transaction.xaframework</package>
+                <package>org.neo4j.kernel.impl.traversal</package>
+                <package>org.neo4j.kernel.impl.util</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/neo4j-kernel-2.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/neo4j-kernel-2.0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/geronimo-jta_1.1_spec-1.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>

Neo4jWrapper/src/org/gephi/lib/neo4j/Bundle.properties

@@ -1,5 +1,5 @@
 OpenIDE-Module-Display-Category=Libraries
 OpenIDE-Module-Long-Description=\
-    Neo4j Version 1.9.M04
+    Neo4j Version 2.0.1
 OpenIDE-Module-Name=Neo4j Wrapper
 OpenIDE-Module-Short-Description=Neo4j Graph Database

nbproject/platform.properties

@@ -1,3 +1,4 @@
+branding.token=gephi
 suite.dir=${basedir}
 platform.version = 7.2.1
 gephi.version = 0.8.2