repackaged rest integration

This commit is contained in:
Michael Hunger
2011-04-07 13:42:12 +02:00
parent b27980c242
commit 478b8bb009
45 changed files with 71 additions and 80 deletions

View File

@@ -24,7 +24,7 @@ import org.neo4j.kernel.impl.transaction.LockManager;
import org.neo4j.kernel.impl.transaction.TxModule;
import org.neo4j.kernel.impl.transaction.xaframework.LogBufferFactory;
import org.neo4j.kernel.impl.transaction.xaframework.TxIdGenerator;
import org.neo4j.rest.graphdb.RestGraphDatabase;
import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
import javax.transaction.*;
import javax.transaction.xa.XAResource;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
/**
* @author mh

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
/**
* @author mh

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.ClientResponse;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.NotFoundException;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.helpers.collection.IterableWrapper;
import org.neo4j.rest.graphdb.util.ArrayConverter;
import org.springframework.data.graph.neo4j.rest.support.util.ArrayConverter;
import javax.ws.rs.core.Response.Status;
import java.net.URI;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.ClientResponse;
import org.neo4j.graphdb.*;
@@ -25,7 +25,7 @@ import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.neo4j.kernel.Config;
import org.neo4j.kernel.RestConfig;
import org.neo4j.rest.graphdb.index.RestIndexManager;
import org.springframework.data.graph.neo4j.rest.support.index.RestIndexManager;
import org.springframework.data.graph.core.GraphDatabase;
import org.springframework.data.graph.core.Property;

View File

@@ -14,11 +14,9 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
import org.neo4j.graphdb.*;
import org.neo4j.graphdb.Traverser.Order;
import org.neo4j.helpers.collection.IterableWrapper;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.*;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.ClientResponse;
import org.neo4j.graphdb.Direction;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.traversal.TraversalDescription;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;

View File

@@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb.index;
package org.springframework.data.graph.neo4j.rest.support.index;
import com.sun.jersey.api.client.ClientResponse;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.index.IndexHits;
import org.neo4j.rest.graphdb.JsonHelper;
import org.neo4j.rest.graphdb.RestEntity;
import org.neo4j.rest.graphdb.RestGraphDatabase;
import org.neo4j.rest.graphdb.RestRequest;
import org.springframework.data.graph.neo4j.rest.support.JsonHelper;
import org.springframework.data.graph.neo4j.rest.support.RestEntity;
import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
import org.springframework.data.graph.neo4j.rest.support.RestRequest;
import javax.ws.rs.core.Response;
import java.util.Collection;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb.index;
package org.springframework.data.graph.neo4j.rest.support.index;
import com.sun.jersey.api.client.ClientResponse;
import org.neo4j.graphdb.Node;
@@ -22,8 +22,8 @@ import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.graphdb.index.RelationshipIndex;
import org.neo4j.rest.graphdb.RestGraphDatabase;
import org.neo4j.rest.graphdb.RestRequest;
import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
import org.springframework.data.graph.neo4j.rest.support.RestRequest;
import java.util.Collections;
import java.util.Map;

View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb.index;
package org.springframework.data.graph.neo4j.rest.support.index;
import org.neo4j.graphdb.Node;
import org.neo4j.rest.graphdb.RestGraphDatabase;
import org.neo4j.rest.graphdb.RestNode;
import org.neo4j.rest.graphdb.RestRequest;
import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
import org.springframework.data.graph.neo4j.rest.support.RestNode;
import org.springframework.data.graph.neo4j.rest.support.RestRequest;
import java.util.Map;

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb.index;
package org.springframework.data.graph.neo4j.rest.support.index;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.index.RelationshipIndex;
import org.neo4j.rest.graphdb.RestGraphDatabase;
import org.neo4j.rest.graphdb.RestRelationship;
import org.neo4j.rest.graphdb.RestRequest;
import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase;
import org.springframework.data.graph.neo4j.rest.support.RestRelationship;
import org.springframework.data.graph.neo4j.rest.support.RestRequest;
import java.util.Map;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb.util;
package org.springframework.data.graph.neo4j.rest.support.util;
import java.lang.reflect.Array;
import java.util.Collection;

View File

@@ -14,15 +14,14 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.EntityPropertyValidationTest;
import org.springframework.data.graph.neo4j.support.IndexTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.GraphRepositoryTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.IndexTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.neo4j.rest.graphdb.RestTestHelper;
import org.springframework.data.graph.neo4j.rest.support.RestTestHelper;
import org.springframework.data.graph.core.GraphDatabase;
import org.springframework.data.graph.neo4j.template.Neo4jTemplateTest;
import org.springframework.transaction.PlatformTransactionManager;

View File

@@ -14,16 +14,14 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.fieldaccess.NodeRelationshipFieldAccessorFactory;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest;
import org.springframework.data.graph.neo4j.support.NodeEntityTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;
@@ -31,8 +29,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
import java.net.NoRouteToHostException;
/**
* @author mh
* @since 28.03.11

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.NodeEntityTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.ProjectionTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.PropertyTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.support.PropertyTest;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.RelationshipEntityTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.springframework.data.graph.neo4j.rest;
package org.springframework.data.graph.neo4j.rest.integration;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.neo4j.rest.graphdb.RestTestBase;
import org.springframework.data.graph.neo4j.rest.support.RestTestBase;
import org.springframework.data.graph.neo4j.support.TraversalTest;
import org.springframework.test.context.CleanContextCacheTestExecutionListener;
import org.springframework.test.context.ContextConfiguration;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.hamcrest.Description;
import org.junit.internal.matchers.TypeSafeMatcher;

View File

@@ -14,9 +14,8 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.neo4j.server.AddressResolver;
import org.neo4j.server.NeoServerWithEmbeddedWebServer;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.Direction;
import org.neo4j.graphdb.Node;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.apache.log4j.BasicConfigurator;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.apache.log4j.BasicConfigurator;

View File

@@ -14,12 +14,14 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.neo4j.kernel.Uniqueness;
import org.springframework.data.graph.neo4j.rest.support.RestTraversal;
import org.springframework.data.graph.neo4j.rest.support.RestTraversalDescription;
import java.util.Map;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
@@ -23,7 +23,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.neo4j.helpers.Pair;
import org.springframework.data.graph.neo4j.server.SpringPluginInitializer;
import javax.ws.rs.POST;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
public interface TestInterface {
void thisIsARecording();

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.neo4j.rest.graphdb;
package org.springframework.data.graph.neo4j.rest.support;
import org.neo4j.graphdb.RelationshipType;

View File

@@ -1 +1 @@
org.neo4j.rest.graphdb.SpringPluginInitializerTest
org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest

View File

@@ -14,7 +14,7 @@
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<bean id="graphDatabaseService" class="org.neo4j.rest.graphdb.RestGraphDatabase" scope="singleton">
<bean id="graphDatabaseService" class="org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase" scope="singleton">
<constructor-arg index="0" value="http://localhost:7473/db/data" />
</bean>
</beans>

View File

@@ -14,6 +14,6 @@
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<bean id="testObject" class="org.neo4j.rest.graphdb.SpringPluginInitializerTest" scope="singleton">
<bean id="testObject" class="org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest" scope="singleton">
</bean>
</beans>

View File

@@ -1,2 +1,2 @@
org.neo4j.server.database.location=target/test-db
org.neo4j.server.thirdparty_jaxrs_classes=org.neo4j.rest.graphdb=/test
org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.graph.neo4j.rest.support=/test