- Fixed so actor roles work

- Changed the jetty app to run against a local server

spring-data-neo4j-examples/cineasts-rest/pom.xml

@@ -247,6 +247,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-kernel</artifactId>
+            <version>${neo4j.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.neo4j.app</groupId>
             <artifactId>neo4j-server</artifactId>

spring-data-neo4j-examples/cineasts-rest/src/main/java/org/neo4j/cineasts/controller/MovieController.java

@@ -4,12 +4,14 @@ import org.neo4j.cineasts.domain.Movie;
 import org.neo4j.cineasts.domain.Person;
 import org.neo4j.cineasts.domain.Rating;
 import org.neo4j.cineasts.domain.User;
+import org.neo4j.cineasts.service.CineastsRepository;
 import org.neo4j.cineasts.service.CineastsUserDetailsService;
 import org.neo4j.cineasts.service.DatabasePopulator;
-import org.neo4j.cineasts.service.CineastsRepository;
+import org.neo4j.helpers.collection.IteratorUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.neo4j.support.Neo4jTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -26,14 +28,16 @@ public class MovieController {
 
     private CineastsRepository moviesRepository;
     private CineastsUserDetailsService userDetailsService;
+    private final Neo4jTemplate template;
     private DatabasePopulator populator;
     private static final Logger log = LoggerFactory.getLogger(MovieController.class);
 
     @Autowired
-    public MovieController(CineastsRepository moviesRepository, DatabasePopulator populator, CineastsUserDetailsService userDetailsService) {
+    public MovieController(CineastsRepository moviesRepository, DatabasePopulator populator, CineastsUserDetailsService userDetailsService, Neo4jTemplate template) {
         this.moviesRepository = moviesRepository;
         this.populator = populator;
         this.userDetailsService = userDetailsService;
+        this.template = template;
     }
 
     // for web service (JSON) clients
@@ -95,6 +99,7 @@ public class MovieController {
         Person person = moviesRepository.getPerson(id);
         model.addAttribute("actor", person);
         model.addAttribute("id", id);
+        model.addAttribute("roles",  IteratorUtil.asCollection(person.getRoles()));
         addUser(model);
         return "/actors/show";
     }

spring-data-neo4j-examples/cineasts-rest/src/main/webapp/WEB-INF/applicationContext.xml

@@ -14,7 +14,12 @@
         <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
     </context:component-scan>
 
-    <neo4j:config storeDirectory="data/graph.db"/>
+    <neo4j:config graphDatabaseService="graphDatabaseService"/>
+    <bean id="graphDatabaseService" class="org.springframework.data.neo4j.rest.SpringRestGraphDatabase" scope="singleton">
+         <constructor-arg index="0" value="http://localhost:7474/db/data" />
+    </bean>
+
+    <!--<neo4j:config  storeDirectory="data/graph.db"/>-->
     <neo4j:repositories base-package="org.neo4j.cineasts.repository"/>
 
     <bean class="org.neo4j.cineasts.movieimport.MovieDbApiClient">

spring-data-neo4j-examples/cineasts-rest/src/main/webapp/WEB-INF/views/actors/show.jsp

@@ -3,6 +3,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%--@elvariable id="actor" type="org.neo4j.cineasts.domain.Actor"--%>
+<%--@elvariable id="role" type="org.neo4j.cineasts.domain.Role"--%>
 <c:choose>
     <c:when test="${actor != null}">
       <div class="span-4">
@@ -20,7 +21,7 @@
         <h2>Roles</h2>
         <c:if test="${not empty actor.roles}">
           <ul>
-            <c:forEach items="${actor.roles}" var="role">
+            <c:forEach items="${roles}" var="role">
               <li>
                 <a href="/movies/${role.movie.id}"><c:out value="${role.movie.title}" /> as <c:out value="${role.name}" /> in <c:out value="${role.movie.year}"/></a><br/>
               </li>

spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/controller/MovieController.java

@@ -7,6 +7,7 @@ import org.neo4j.cineasts.domain.User;
 import org.neo4j.cineasts.service.CineastsUserDetailsService;
 import org.neo4j.cineasts.service.DatabasePopulator;
 import org.neo4j.cineasts.service.CineastsRepository;
+import org.neo4j.helpers.collection.IteratorUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,6 +96,7 @@ public class MovieController {
         Person person = moviesRepository.getPerson(id);
         model.addAttribute("actor", person);
         model.addAttribute("id", id);
+        model.addAttribute("roles",  IteratorUtil.asCollection(person.getRoles()));
         addUser(model);
         return "/actors/show";
     }

spring-data-neo4j-examples/cineasts/src/main/webapp/WEB-INF/views/actors/show.jsp

@@ -3,6 +3,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%--@elvariable id="actor" type="org.neo4j.cineasts.domain.Actor"--%>
+<%--@elvariable id="role" type="org.neo4j.cineasts.domain.Role"--%>
 <c:choose>
     <c:when test="${actor != null}">
       <div class="span-4">
@@ -20,7 +21,7 @@
         <h2>Roles</h2>
         <c:if test="${not empty actor.roles}">
           <ul>
-            <c:forEach items="${actor.roles}" var="role">
+            <c:forEach items="${roles}" var="role">
               <li>
                 <a href="/movies/${role.movie.id}"><c:out value="${role.movie.title}" /> as <c:out value="${role.name}" /> in <c:out value="${role.movie.year}"/></a><br/>
               </li>