Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-260 SDN Relase 2.1.RC2, upgrade to Neo4j 1.7.1, SD Commons 1.3.1.RELEASE

Browse Source
This commit is contained in:
Michael Hunger
2012-06-22 12:48:14 +02:00
parent a9076eecb5
commit 9304ccd042
6 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml
View File

@@ -93,19 +93,6 @@
</constructor-arg>
</bean>
<!--bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
<property name="transactionManager">
<bean class="org.neo4j.kernel.impl.transaction.SpringTransactionManager">
<constructor-arg ref="graphDatabaseService"/>
</bean>
</property>
<property name="userTransaction">
<bean class="org.neo4j.kernel.impl.transaction.UserTransactionImpl">
<constructor-arg ref="graphDatabaseService"/>
</bean>
</property>
</bean-->
<bean id="transactionManager" class="org.springframework.data.neo4j.config.JtaTransactionManagerFactoryBean">
<constructor-arg ref="graphDatabaseService"/>
</bean>

16
spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml
View File

@@ -102,19 +102,9 @@
<bean class="org.springframework.orm.jpa.JpaTransactionManager" id="jpaTransactionManager">
<property name="entityManagerFactory" ref="entityManagerFactory"/>
</bean>
<bean
class="org.springframework.transaction.jta.JtaTransactionManager">
<property name="transactionManager">
<bean class="org.neo4j.kernel.impl.transaction.SpringTransactionManager">
<constructor-arg ref="graphDatabaseService" />
</bean>
</property>
<property name="userTransaction">
<bean class="org.neo4j.kernel.impl.transaction.UserTransactionImpl">
<constructor-arg value="#{graphDatabaseService.txManager}" />
</bean>
</property>
</bean>
<bean class="org.springframework.data.neo4j.config.JtaTransactionManagerFactoryBean">
<constructor-arg ref="graphDatabaseService"/>
</bean>
</list>
</constructor-arg>
</bean>

19
spring-data-neo4j-parent/pom.xml
View File

@@ -126,8 +126,8 @@
<org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
<org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
<org.springframework.version>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version>
<data.commons.version>1.3.1.BUILD-SNAPSHOT</data.commons.version>
<neo4j.version>1.7</neo4j.version>
<data.commons.version>1.3.1.RELEASE</data.commons.version>
<neo4j.version>1.7.1</neo4j.version>
<neo4j.spatial.version>0.8</neo4j.spatial.version>
<aspectj.version>1.6.12</aspectj.version>
<blueprints.version>1.2</blueprints.version>
@@ -758,11 +758,11 @@
</pluginRepositories>
<repositories>
<repository>
<id>spring-milestones</id>
<url>http://repo.springsource.org/libs-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>spring-releases</id>
<url>http://repo.springsource.org/libs-release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>tinkerpop-repository</id>
@@ -785,11 +785,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>neo4j-public-snapshot-repository</id>
<url>http://m2.neo4j.org/snapshots</url>
</repository>
</repositories>
<reporting>
<plugins>

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java
View File

@@ -215,7 +215,7 @@ public class DelegatingGraphDatabase implements GraphDatabase {
@Override
public TransactionManager getTransactionManager() {
return new SpringTransactionManager(delegate);
return new SpringTransactionManager((GraphDatabaseAPI)delegate);
}
@Override

3
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java
View File

@@ -20,6 +20,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.TermQuery;
import org.junit.*;
import org.neo4j.graphdb.*;
import org.neo4j.kernel.GraphDatabaseAPI;
import org.neo4j.graphdb.index.Index;
import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.kernel.Traversal;
@@ -100,7 +101,7 @@ public class Neo4jTemplateApiTest {
}
protected PlatformTransactionManager createTransactionManager() {
return new JtaTransactionManager(new SpringTransactionManager(graphDatabaseService));
return new JtaTransactionManager(new SpringTransactionManager((GraphDatabaseAPI)graphDatabaseService));
}
private void createData() {

3
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java
View File

@@ -19,6 +19,7 @@ package org.springframework.data.neo4j.template;
import org.junit.After;
import org.junit.Before;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.GraphDatabaseAPI;
import org.neo4j.kernel.impl.transaction.SpringTransactionManager;
import org.neo4j.test.ImpermanentGraphDatabase;
import org.springframework.core.convert.ConversionService;
@@ -52,7 +53,7 @@ public abstract class NeoApiTest {
protected PlatformTransactionManager createTransactionManager()
{
return new JtaTransactionManager(new SpringTransactionManager(graphDatabaseService));
return new JtaTransactionManager(new SpringTransactionManager((GraphDatabaseAPI)graphDatabaseService));
}
protected GraphDatabase createGraphDatabase() throws Exception