diff --git a/pom.xml b/pom.xml index 4f337c5..0e5d575 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,8 @@ 1.9-SNAPSHOT Neo4j Batch Importer - 1.9.M05 + 1.9 + GPL-3-header.txt @@ -14,6 +15,26 @@ + + + GNU General Public License, Version 3 + http://www.gnu.org/licenses/gpl-3.0-standalone.html + The software ("Software") developed and owned by Network Engine for + Objects in Lund AB (referred to in this notice as "Neo Technology") is + licensed under the GNU GENERAL PUBLIC LICENSE Version 3 to all third + parties and that license is included below. + + However, if you have executed an End User Software License and Services + Agreement or an OEM Software License and Support Services Agreement, or + another commercial license agreement with Neo Technology or one of its + affiliates (each, a "Commercial Agreement"), the terms of the license in + such Commercial Agreement will supersede the GNU GENERAL PUBLIC LICENSE + Version 3 and you may use the Software solely pursuant to the terms of + the relevant Commercial Agreement. + + + + edu.ucla.sspace diff --git a/src/NOTICE.txt b/src/NOTICE.txt new file mode 100644 index 0000000..39eef92 --- /dev/null +++ b/src/NOTICE.txt @@ -0,0 +1,83 @@ +Neo4j +Copyright © 2002-2011 Network Engine for Objects in Lund AB (referred to +in this notice as “Neo Technology”) + [http://neotechnology.com] + +This product includes software ("Software") developed by Neo Technology. + +The copyright in the bundled Neo4j graph database (including the +Software) is owned by Neo Technology. The Software developed and owned +by Neo Technology is licensed under the GNU GENERAL PUBLIC LICENSE +Version 3 (http://www.fsf.org/licensing/licenses/gpl-3.0.html) ("GPL") +to all third parties and that license, as required by the GPL, is +included in the LICENSE.txt file. + +However, if you have executed an End User Software License and Services +Agreement or an OEM Software License and Support Services Agreement, or +another commercial license agreement with Neo Technology or one of its +affiliates (each, a "Commercial Agreement"), the terms of the license in +such Commercial Agreement will supersede the GPL and you may use the +software solely pursuant to the terms of the relevant Commercial +Agreement. + + +Third party libraries +--------------------- + +Full license texts are found in LICENSES.txt. + + +The bundled JAX-RS (JSR311) API is licensed under the GNU General +Public License Version 2 with classpath exception. Alternatively +under the Common Development and Distribution License, version 1.1. + +The bundled Jersey library, containing Jersey Core, Jersey Server, and +Jersey Client, is licensed under the GNU General Public License +Version 2 with classpath exception. Alternatively under the Common +Development and Distribution License, version 1.1. + +The Mime streaming plugin library is licensed under the GNU General +Public License Version 2 with classpath exception. Alternatively +under the Common Development and Distribution License, version 1.0. + +Other bundled libraries are licenced according to the following listing. + +The Apache Software License, Version 2.0: + Apache ServiceMix :: Bundles :: lucene, + Apache Commons: + Commons BeanUtils, Commons BeanUtils Core, Commons Collections, Commons IO, + Commons Configuration, Commons Digester, Commons Lang, Commons Logging, + Apache Log4j, + Apache Felix: Felix FileInstall, Felix Framework, Felix Main, + JSON.simple, + RRD4J, + Geronimo Java Transaction API, + Groovy, + Jackson: Jackson Core, Jackson JAX-RS, Data Mapper for Jackson, + Jansi, + Jetty: Jetty, Jetty Util, Jetty Servlet Specification API, + +MIT License: + SLF4J API Module, SLF4J Log4j-12 Binding, SLF4J JDK1.4 Logging Binding, + SLF4J Jakarta Commons Logging Binding, + Base64.js, + jTemplates, + jQuery, + jQuery BBQ, + jQuery hashchange event, + SimpleModal, + jQuery flot including colorhelpers + +BSD licence: + ASM: ASM Core, ASM Tree, ASM Commons, ASM Util, ASM Analysis, + Blueprints: Data Models and their Implementations, + Gremlin: A Graph-Based Programming Language, + Pipes: A Data Flow Framework using Process Graphs, + JLine, Scala library + +provided without support or warranty: JSON (JavaScript Object Notation) + +Public domain: + Dough Lea's util.concurrent package, + ANTLR 2.7.7, + JSON2.js diff --git a/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java b/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java index ad2f334..e63aadf 100644 --- a/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java +++ b/src/main/java/org/neo4j/unsafe/batchinsert/BatchInserterImpl.java @@ -33,6 +33,7 @@ import org.neo4j.kernel.impl.util.StringLogger; import java.io.File; +import java.io.IOException; import java.util.*; import java.util.Map.Entry; @@ -897,11 +898,14 @@ private File fixPath( File dir, StoreFactory sf ) { if ( !fileSystem.fileExists( dir ) ) { - if ( !fileSystem.mkdirs( dir ) ) + try + { + fileSystem.mkdirs( dir ); + } catch( IOException ioe ) { throw new UnderlyingStorageException( "Unable to create directory path[" - + storeDir + "] for Neo4j kernel store." ); + + storeDir + "] for Neo4j kernel store.",ioe ); } } File store = new File( dir, NeoStore.DEFAULT_NAME); diff --git a/src/test/java/org/neo4j/batchimport/handlers/RelationshipUpdateCacheTest.java b/src/test/java/org/neo4j/batchimport/handlers/RelationshipUpdateCacheTest.java index 0014659..89d2ccd 100644 --- a/src/test/java/org/neo4j/batchimport/handlers/RelationshipUpdateCacheTest.java +++ b/src/test/java/org/neo4j/batchimport/handlers/RelationshipUpdateCacheTest.java @@ -1,5 +1,6 @@ package org.neo4j.batchimport.handlers; +import org.junit.Ignore; import org.junit.Test; import org.neo4j.batchimport.structs.NodeStruct; import org.neo4j.batchimport.structs.Relationship; @@ -13,6 +14,7 @@ * @author mh * @since 10.11.12 */ +@Ignore("Direct Memory Size") public class RelationshipUpdateCacheTest { @Test public void testWriteRelationship() throws Exception {