Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updated myrestaurant-social to spring-data-graph 1.0.0.M02

  • Loading branch information...
commit 235d04213952b421073bb4efeff0038f4406f264 1 parent afb9dfc
Michael Hunger jexp authored
181 hello-worlds/hello-worlds.iws
View
@@ -91,55 +91,58 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="WorldRepository.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/WorldRepository.java">
+ <file leaf-file-name="AbstractAutowireCapableBeanFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="49" selection-start="2057" selection-end="2057" vertical-scroll-proportion="0.0">
+ <state line="878" column="0" selection-start="35844" selection-end="35844" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HelloWorldNeo4jConfiguration.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/HelloWorldNeo4jConfiguration.java">
+ <file leaf-file-name="AbstractNeo4jConfiguration.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/config/AbstractNeo4jConfiguration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="27" selection-start="469" selection-end="469" vertical-scroll-proportion="0.0">
+ <state line="62" column="41" selection-start="3077" selection-end="3077" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractAutowireCapableBeanFactory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java">
+ <file leaf-file-name="GraphDatabaseContext.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="878" column="0" selection-start="35844" selection-end="35844" vertical-scroll-proportion="0.0">
+ <state line="47" column="13" selection-start="1940" selection-end="1940" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractNeo4jConfiguration.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/config/AbstractNeo4jConfiguration.java">
+ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="41" selection-start="3077" selection-end="3077" vertical-scroll-proportion="0.0">
+ <state line="17" column="37" selection-start="807" selection-end="809" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="GraphDatabaseContext.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java">
+ <file leaf-file-name="helloWorldContext.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/helloWorldContext.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="13" selection-start="1940" selection-end="1940" vertical-scroll-proportion="0.0">
+ <state line="19" column="0" selection-start="880" selection-end="880" vertical-scroll-proportion="-4.8510637">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
+ <state />
+ </provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="WorldRepository.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/WorldRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="132" column="54" selection-start="4502" selection-end="4502" vertical-scroll-proportion="0.0">
+ <state line="69" column="49" selection-start="2057" selection-end="2057" vertical-scroll-proportion="1.118797">
<folding />
</state>
</provider>
@@ -172,10 +175,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="App.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="App.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/App.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="18" selection-start="207" selection-end="207" vertical-scroll-proportion="0.10983982">
+ <state line="10" column="49" selection-start="314" selection-end="314" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -286,62 +289,6 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hellograph" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hello-worlds" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hello-worlds" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hello-worlds" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hello-worlds" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hellograph" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -537,7 +484,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="22" width="1440" height="874" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -546,7 +493,6 @@
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891247" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32997844" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -556,6 +502,7 @@
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891247" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -612,96 +559,76 @@
<state line="25" column="13" selection-start="1104" selection-end="1104" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/helloWorldContext.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/World.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
- <state />
+ <state line="56" column="8" selection-start="1277" selection-end="1277" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/World.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/finder/FinderFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="8" selection-start="1277" selection-end="1277" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="25" column="13" selection-start="937" selection-end="937" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/finder/FinderFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/HelloWorldNeo4jConfiguration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="13" selection-start="937" selection-end="937" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="14" column="27" selection-start="469" selection-end="469" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="285" column="12" selection-start="12048" selection-end="12048" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="878" column="0" selection-start="35844" selection-end="35844" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/ConstructorResolver.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/config/AbstractNeo4jConfiguration.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="401" column="24" selection-start="15233" selection-end="15233" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="62" column="41" selection-start="3077" selection-end="3077" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/HelloWorldNeo4jConfiguration.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="27" selection-start="469" selection-end="469" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="47" column="13" selection-start="1940" selection-end="1940" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="878" column="0" selection-start="35844" selection-end="35844" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="17" column="37" selection-start="807" selection-end="809" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/config/AbstractNeo4jConfiguration.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="41" selection-start="3077" selection-end="3077" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="285" column="12" selection-start="12048" selection-end="12048" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-neo4j/1.0.0.M2/spring-data-neo4j-1.0.0.M2-sources.jar!/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/3.0.4.RELEASE/spring-beans-3.0.4.RELEASE-sources.jar!/org/springframework/beans/factory/support/ConstructorResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="13" selection-start="1940" selection-end="1940" vertical-scroll-proportion="0.0">
+ <state line="401" column="24" selection-start="15233" selection-end="15233" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/springframework/data/neo4j/examples/hellograph/WorldRepositoryTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="132" column="54" selection-start="4502" selection-end="4502" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="124" column="42" selection-start="3704" selection-end="3718" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/WorldRepository.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/App.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="49" selection-start="2057" selection-end="2057" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="10" column="49" selection-start="314" selection-end="314" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/springframework/data/neo4j/examples/hellograph/WorldRepositoryTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/helloWorldContext.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="124" column="42" selection-start="3704" selection-end="3718" vertical-scroll-proportion="0.0">
+ <state line="19" column="0" selection-start="880" selection-end="880" vertical-scroll-proportion="-4.8510637">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.spring.perspectives.SpringBeansStructureEditorProvider">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/App.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/springframework/data/neo4j/examples/hellograph/WorldRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="18" selection-start="207" selection-end="207" vertical-scroll-proportion="0.10983982">
+ <state line="69" column="49" selection-start="2057" selection-end="2057" vertical-scroll-proportion="1.118797">
<folding />
</state>
</provider>
4 myrestaurants-social/pom.xml
View
@@ -7,8 +7,8 @@
<version>0.1.0.BUILD-SNAPSHOT</version>
<name>myrestaurants-social</name>
<properties>
- <spring.version>3.0.4.RELEASE</spring.version>
- <spring-data-graph.version>1.0.0.M1</spring-data-graph.version>
+ <spring.version>3.0.5.RELEASE</spring.version>
+ <spring-data-graph.version>1.0.0.M2</spring-data-graph.version>
<aspectj.version>1.6.10.RELEASE</aspectj.version>
<slf4j.version>1.6.1</slf4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
89 myrestaurants-social/src/main/resources/META-INF/spring/applicationContext.xml
View
@@ -76,94 +76,9 @@
<jdbc:script location="classpath:restaurants-sample-data.sql"/>
</jdbc:embedded-database>
- <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
+ <bean class="com.springone.myrestaurants.DataStoreConfig"/>
- <bean id="neo4jNodeBacking" class="org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="nodeEntityStateAccessorsFactory" ref="nodeEntityStateAccessorsFactory"/>
- </bean>
-
- <bean class="org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="relationshipEntityStateAccessorsFactory" ref="relationshipEntityStateAccessorsFactory"/>
- </bean>
-
- <bean id="graphDatabaseService" class="org.neo4j.kernel.EmbeddedGraphDatabase"
- destroy-method="shutdown" scope="singleton">
- <constructor-arg index="0" value="target/data/recommendation" />
- </bean>
-
- <bean id="indexService" class="org.neo4j.index.lucene.LuceneIndexService" destroy-method="shutdown">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="graphDatabaseContext" class="org.springframework.data.graph.neo4j.support.GraphDatabaseContext">
- <property name="graphDatabaseService" ref="graphDatabaseService"/>
- <property name="indexService" ref="indexService"/>
- <property name="relationshipEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.relationship.ConstructorBypassingGraphRelationshipInstantiator" />
- </property>
- <property name="graphEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.node.PartialNeo4jEntityInstantiator">
- <property name="entityInstantiator" >
- <bean class="org.springframework.data.graph.neo4j.support.node.Neo4jConstructorGraphEntityInstantiator"/>
- </property>
- </bean>
- </property>
- <property name="conversionService">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
- </property>
- <property name="nodeTypeStrategy">
- <bean class="org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy">
- <constructor-arg index="0" ref="graphDatabaseContext"/>
- </bean>
- </property>
- </bean>
-
- <bean id="nodeEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory">
- <property name="nodeDelegatingFieldAccessorFactory">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory">
- <constructor-arg ref="graphDatabaseContext"/>
- <constructor-arg ref="finderFactory"/>
- </bean>
- </property>
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
- <bean id="relationshipEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
- <bean id="finderFactory" class="org.springframework.data.graph.neo4j.finder.FinderFactory">
- <constructor-arg ref="graphDatabaseContext" />
- </bean>
-
- <bean id="transactionManager" class="org.springframework.persistence.transaction.NaiveDoubleTransactionManager" >
- <constructor-arg>
- <bean class="org.springframework.orm.jpa.JpaTransactionManager" id="jpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory"/>
- </bean>
- </constructor-arg>
- <constructor-arg>
- <bean
- class="org.springframework.transaction.jta.JtaTransactionManager">
- <property name="transactionManager" ref="neo4jTransactionManagerService" />
- <property name="userTransaction" ref="neo4jUserTransactionService" />
- </bean>
- </constructor-arg>
- </bean>
-
- <bean id="neo4jTransactionManagerService" class="org.neo4j.kernel.impl.transaction.SpringTransactionManager" >
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="neo4jUserTransactionService" class="org.neo4j.kernel.impl.transaction.UserTransactionImpl">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory" depends-on="neo4jNodeBacking">
+ <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory"> <!-- depends-on="neo4jNodeBacking" -->
<property name="dataSource" ref="dataSource"/>
</bean>
95 myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/DataStore-context.xml
View
@@ -19,69 +19,9 @@
<!--
Graph datastore config
-->
- <bean id="neo4jNodeBacking" class="org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="nodeEntityStateAccessorsFactory" ref="nodeEntityStateAccessorsFactory"/>
- </bean>
-
- <bean class="org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="relationshipEntityStateAccessorsFactory" ref="relationshipEntityStateAccessorsFactory"/>
- </bean>
-
- <bean id="graphDatabaseService" class="org.neo4j.kernel.EmbeddedGraphDatabase"
- destroy-method="shutdown" scope="singleton">
- <constructor-arg index="0" value="target/data/test" />
- </bean>
-
- <bean id="indexService" class="org.neo4j.index.lucene.LuceneIndexService" destroy-method="shutdown">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="graphDatabaseContext" class="org.springframework.data.graph.neo4j.support.GraphDatabaseContext">
- <property name="graphDatabaseService" ref="graphDatabaseService"/>
- <property name="indexService" ref="indexService"/>
- <property name="relationshipEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.relationship.ConstructorBypassingGraphRelationshipInstantiator" />
- </property>
- <property name="graphEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.node.PartialNeo4jEntityInstantiator">
- <property name="entityInstantiator" >
- <bean class="org.springframework.data.graph.neo4j.support.node.Neo4jConstructorGraphEntityInstantiator"/>
- </property>
- </bean>
- </property>
- <property name="conversionService">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
- </property>
- <property name="nodeTypeStrategy">
- <bean class="org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy">
- <constructor-arg index="0" ref="graphDatabaseContext"/>
- </bean>
- </property>
- </bean>
-
- <bean id="nodeEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory">
- <property name="nodeDelegatingFieldAccessorFactory">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory">
- <constructor-arg ref="graphDatabaseContext"/>
- <constructor-arg ref="finderFactory"/>
- </bean>
- </property>
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
- <bean id="relationshipEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
-
- <bean id="finderFactory" class="org.springframework.data.graph.neo4j.finder.FinderFactory">
- <constructor-arg ref="graphDatabaseContext" />
- </bean>
-
+ <context:annotation-config/>
+ <bean class="com.springone.myrestaurants.DataStoreTestConfig"/>
+ <bean class="org.springframework.context.annotation.ConfigurationClassPostProcessor"/>
<!--
JPA config
-->
@@ -90,35 +30,8 @@
<jdbc:script location="classpath:restaurants-sample-data.sql"/>
</jdbc:embedded-database>
- <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory" depends-on="neo4jNodeBacking">
+ <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory"><!--depends-on="neo4jNodeBacking"-->
<property name="dataSource" ref="dataSource"/>
<property name="persistenceXmlLocation" value="classpath:META-INF/persistence.xml"/>
</bean>
-
- <!--
- TX config
- -->
- <bean id="neo4jTransactionManagerService" class="org.neo4j.kernel.impl.transaction.SpringTransactionManager" >
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="neo4jUserTransactionService" class="org.neo4j.kernel.impl.transaction.UserTransactionImpl">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="transactionManager" class="org.springframework.persistence.transaction.NaiveDoubleTransactionManager" >
- <constructor-arg>
- <bean class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory"/>
- </bean>
- </constructor-arg>
- <constructor-arg>
- <bean
- class="org.springframework.transaction.jta.JtaTransactionManager">
- <property name="transactionManager" ref="neo4jTransactionManagerService" />
- <property name="userTransaction" ref="neo4jUserTransactionService" />
- </bean>
- </constructor-arg>
- </bean>
-
</beans>
5 ...taurants-social/src/test/resources/com/springone/myrestaurants/data/RestaurantRepositoryTest-context.xml
View
@@ -16,6 +16,8 @@
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">
+ <import resource="DataStore-context.xml"/>
+
<context:spring-configured/>
<context:component-scan base-package="com.springone.myrestaurants">
@@ -24,6 +26,5 @@
<tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
- <import resource="DataStore-context.xml"/>
-
+
</beans>
5 ...ants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRelationshipsTest-context.xml
View
@@ -16,6 +16,8 @@
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">
+ <import resource="DataStore-context.xml"/>
+
<context:spring-configured/>
<context:component-scan base-package="com.springone.myrestaurants">
@@ -24,6 +26,5 @@
<tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
- <import resource="DataStore-context.xml"/>
-
+
</beans>
5 ...aurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRepositoryTest-context.xml
View
@@ -16,6 +16,8 @@
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">
+ <import resource="DataStore-context.xml"/>
+
<context:spring-configured/>
<context:component-scan base-package="com.springone.myrestaurants">
@@ -24,6 +26,5 @@
<tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
- <import resource="DataStore-context.xml"/>
-
+
</beans>
93 myrestaurants-social/src/test/resources/com/springone/myrestaurants/domain/DataStore-context.xml
View
@@ -19,70 +19,10 @@
<!--
Graph datastore config
-->
- <bean id="neo4jNodeBacking" class="org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="nodeEntityStateAccessorsFactory" ref="nodeEntityStateAccessorsFactory"/>
- </bean>
- <bean class="org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking" factory-method="aspectOf">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="relationshipEntityStateAccessorsFactory" ref="relationshipEntityStateAccessorsFactory"/>
- </bean>
+ <bean class="com.springone.myrestaurants.DataStoreTestConfig"/>
- <bean id="graphDatabaseService" class="org.neo4j.kernel.EmbeddedGraphDatabase"
- destroy-method="shutdown" scope="singleton">
- <constructor-arg index="0" value="target/data/test" />
- </bean>
-
- <bean id="indexService" class="org.neo4j.index.lucene.LuceneIndexService" destroy-method="shutdown">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="graphDatabaseContext" class="org.springframework.data.graph.neo4j.support.GraphDatabaseContext">
- <property name="graphDatabaseService" ref="graphDatabaseService"/>
- <property name="indexService" ref="indexService"/>
- <property name="relationshipEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.relationship.ConstructorBypassingGraphRelationshipInstantiator" />
- </property>
- <property name="graphEntityInstantiator">
- <bean class="org.springframework.data.graph.neo4j.support.node.PartialNeo4jEntityInstantiator">
- <property name="entityInstantiator" >
- <bean class="org.springframework.data.graph.neo4j.support.node.Neo4jConstructorGraphEntityInstantiator"/>
- </property>
- </bean>
- </property>
- <property name="conversionService">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
- </property>
- <property name="nodeTypeStrategy">
- <bean class="org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeStrategy">
- <constructor-arg index="0" ref="graphDatabaseContext"/>
- </bean>
- </property>
- </bean>
-
- <bean id="nodeEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory">
- <property name="nodeDelegatingFieldAccessorFactory">
- <bean class="org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory">
- <constructor-arg ref="graphDatabaseContext"/>
- <constructor-arg ref="finderFactory"/>
- </bean>
- </property>
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
- <bean id="relationshipEntityStateAccessorsFactory" class="org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateAccessorsFactory">
- <property name="graphDatabaseContext" ref="graphDatabaseContext"/>
- <property name="finderFactory" ref="finderFactory"/>
- </bean>
-
-
- <bean id="finderFactory" class="org.springframework.data.graph.neo4j.finder.FinderFactory">
- <constructor-arg ref="graphDatabaseContext" />
- </bean>
-
- <!--
+ <!--
JPA config
-->
<jdbc:embedded-database id="dataSource" type="HSQL">
@@ -90,35 +30,8 @@
<jdbc:script location="classpath:restaurants-sample-data.sql"/> -->
</jdbc:embedded-database>
- <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory" depends-on="neo4jNodeBacking">
+ <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory"><!-- depends-on="neo4jNodeBacking"-->
<property name="dataSource" ref="dataSource"/>
<property name="persistenceXmlLocation" value="classpath:META-INF/persistence.xml"/>
</bean>
-
- <!--
- TX config
- -->
- <bean id="neo4jTransactionManagerService" class="org.neo4j.kernel.impl.transaction.SpringTransactionManager" >
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="neo4jUserTransactionService" class="org.neo4j.kernel.impl.transaction.UserTransactionImpl">
- <constructor-arg index="0" ref="graphDatabaseService" />
- </bean>
-
- <bean id="transactionManager" class="org.springframework.persistence.transaction.NaiveDoubleTransactionManager" >
- <constructor-arg>
- <bean class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory"/>
- </bean>
- </constructor-arg>
- <constructor-arg>
- <bean
- class="org.springframework.transaction.jta.JtaTransactionManager">
- <property name="transactionManager" ref="neo4jTransactionManagerService" />
- <property name="userTransaction" ref="neo4jUserTransactionService" />
- </bean>
- </constructor-arg>
- </bean>
-
</beans>
Please sign in to comment.
Something went wrong with that request. Please try again.