Skip to content

Commit eaeb9bb

Browse files
Aleksa VukoticAleksa Vukotic
Aleksa Vukotic
authored and
Aleksa Vukotic
committed
Revert to Neo4j 1.4.2, so that Neoclipse visualisation works. WARNING this breaks Koan08 and Koan11
1 parent 036a52f commit eaeb9bb

File tree

3 files changed

+66
-53
lines changed

3 files changed

+66
-53
lines changed

‎settings/ivy.xml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
11
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
2-
<info organisation="org.jimwebber" module="neo4j-koans"/>
2+
<info organisation="org.jimwebber" module="neo4j-koans" />
33
<dependencies>
4-
<dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
5-
<exclude module="jms"/>
6-
<exclude module="jmxtools"/>
7-
<exclude module="jmxri"/>
8-
<exclude org="org.slf4j" name="slf4j-log4j12"/>
4+
<dependency org="org.neo4j.app" name="neo4j-server" rev="1.4.2"
5+
transitive="true">
6+
<artifact name="neo4j-server" ext="jar" />
7+
<artifact name="neo4j-server" m:classifier="static-web" ext="jar" />
8+
<artifact name="neo4j-server" m:classifier="tests" ext="jar" />
99
</dependency>
10-
<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11"/>
11-
<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11"/>
12-
<dependency org="org.neo4j.app" name="neo4j-server" rev="1.5-SNAPSHOT" transitive="true">
13-
<artifact name="neo4j-server" ext="jar"/>
14-
<artifact name="neo4j-server" m:classifier="static-web" ext="jar"/>
15-
<artifact name="neo4j-server" m:classifier="tests" ext="jar"/>
16-
</dependency>
17-
<dependency org="org.neo4j" name="neo4j-community" rev="1.5-SNAPSHOT"/>
18-
<dependency org="org.neo4j" name="neo4j-kernel" rev="1.5-SNAPSHOT">
19-
<artifact name="neo4j-kernel" ext="jar"/>
20-
<artifact name="neo4j-kernel" m:classifier="tests" ext="jar"/>
21-
</dependency>
22-
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.5"/>
23-
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.5"/>
24-
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.25"/>
25-
<dependency org="org.rrd4j" name="rrd4j" rev="2.0.7" transitive="false"/>
26-
<dependency org="com.sun.jersey" name="jersey-client" rev="1.6"/>
27-
<dependency org="com.sun.jersey" name="jersey-core" rev="1.6"/>
28-
<dependency org="com.sun.jersey" name="jersey-server" rev="1.6"/>
29-
<dependency org="org.mockito" name="mockito-all" rev="1.8.5"/>
30-
<dependency org="junit" name="junit" rev="4.7"/>
10+
<dependency org="org.neo4j" name="neo4j-community" rev="1.4.2" />
11+
<dependency org="org.neo4j" name="neo4j-kernel" rev="1.4.2">
12+
<artifact name="neo4j-kernel" ext="jar" />
13+
<artifact name="neo4j-kernel" m:classifier="tests" ext="jar" />
14+
</dependency>
15+
<dependency org="org.codehaus.jackson" name="jackson-core-asl"
16+
rev="1.7.5" />
17+
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
18+
rev="1.7.5" />
19+
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.25" />
20+
<dependency org="org.rrd4j" name="rrd4j" rev="2.0.7"
21+
transitive="false" />
22+
<dependency org="com.sun.jersey" name="jersey-client" rev="1.6" />
23+
<dependency org="com.sun.jersey" name="jersey-core" rev="1.6" />
24+
<dependency org="com.sun.jersey" name="jersey-server" rev="1.6" />
25+
<dependency org="org.mockito" name="mockito-all" rev="1.8.5" />
26+
<dependency org="junit" name="junit" rev="4.7" />
27+
<dependency org="org.springframework.data" name="spring-data-neo4j"
28+
rev="1.0.0.RELEASE">
29+
<exclude module="jms" />
30+
<exclude module="jmxtools" />
31+
<exclude module="jmxri" />
32+
<exclude org="org.slf4j" name="slf4j-log4j12" />
33+
</dependency>
34+
<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11" />
35+
<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11" />
36+
3137
</dependencies>
3238
</ivy-module>

‎settings/ivysettings.xml‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
<?xml version="1.0"?>
22
<ivysettings>
3-
<settings defaultResolver="chained" />
4-
<resolvers>
5-
<url name="neo4j-snapshot-hack">
6-
<artifact pattern="http://repo.neo4j.org/content/repositories/snapshots/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
7-
</url>
8-
<chain name="chained" returnFirst="false">
9-
<ibiblio name="neo4j-snapshot" m2compatible="true" root="http://repo.neo4j.org/content/repositories/snapshots"/>
10-
<ibiblio name="neo4j" root="http://m2.neo4j.org/" m2compatible="true" />
11-
<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/" m2compatible="true" />
12-
<ibiblio name="jboss" root="http://repository.jboss.org/nexus/content/groups/public/" m2compatible="true" />
13-
<ibiblio name="springframework" root="http://maven.springframework.org/release" m2compatible="true" />
14-
<ibiblio name="springframework_milestone" root="http://maven.springframework.org/milestone" m2compatible="true" />
15-
<ibiblio name="jacorb" root="http://maven.ow2.org/maven2/" m2compatible="true" />
16-
</chain>
17-
</resolvers>
18-
<modules>
19-
<module organisation="org.neo4j.app" name="neo4j-server" resolver="neo4j-snapshot-hack"/>
20-
</modules>
21-
<caches>
22-
<cache name="default-cache" basedir="${ivy.cache.dir}" />
23-
</caches>
3+
<settings defaultResolver="chained" />
4+
<resolvers>
5+
<!-- <url name="neo4j-snapshot-hack"> <artifact pattern="http://repo.neo4j.org/content/repositories/snapshots/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
6+
</url> -->
7+
<chain name="chained" returnFirst="false">
8+
<!-- <ibiblio name="neo4j-snapshot" m2compatible="true" root="http://repo.neo4j.org/content/repositories/snapshots"/> -->
9+
<ibiblio name="neo4j" root="http://m2.neo4j.org/"
10+
m2compatible="true" />
11+
<ibiblio name="maven_central" root="http://repo2.maven.org/maven2/"
12+
m2compatible="true" />
13+
<ibiblio name="jboss"
14+
root="http://repository.jboss.org/nexus/content/groups/public/"
15+
m2compatible="true" />
16+
<ibiblio name="springframework" root="http://maven.springframework.org/release"
17+
m2compatible="true" />
18+
<ibiblio name="springframework_milestone" root="http://maven.springframework.org/milestone"
19+
m2compatible="true" />
20+
<ibiblio name="jacorb" root="http://maven.ow2.org/maven2/"
21+
m2compatible="true" />
22+
</chain>
23+
</resolvers>
24+
<!-- <modules> <module organisation="org.neo4j.app" name="neo4j-server"
25+
resolver="neo4j-snapshot-hack"/> </modules> -->
26+
<caches>
27+
<cache name="default-cache" basedir="${ivy.cache.dir}" />
28+
</caches>
2429
</ivysettings>

‎src/koan/java/org/neo4j/tutorial/Koan08.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void shouldFindAllTheEpisodesInWhichTheDaleksAppeared() throws Exception
4848
// YOUR CODE GOES HERE
4949
// SNIPPET_START
5050

51-
cql = "START daleks = node:Species(species =\"Dalek\") MATCH (daleks)-[:APPEARED_IN]->(episode) RETURN episode";
51+
cql = "START daleks = (Species,species,\"Dalek\") MATCH (daleks)-[:APPEARED_IN]->(episode) RETURN episode";
5252

5353
// SNIPPET_END
5454

@@ -75,7 +75,7 @@ public void shouldFindEpisodesWhereTennantAndRoseBattleTheDaleks() throws Except
7575
// YOUR CODE GOES HERE
7676
// SNIPPET_START
7777

78-
cql = "start daleks = node:Species( species = \"Dalek\"), rose = node:Characters( character= \"Rose Tyler\"), tennant = node:actors( actor = \"David Tennant\")";
78+
cql = "start daleks = (species,species,'Dalek'), rose = (characters,character,'Rose Tyler'), tennant = (actors, actor, 'David Tennant')";
7979
cql += "match (tennant)-[:APPEARED_IN]->(ep), (rose)-[:APPEARED_IN]->(ep), (daleks)-[:APPEARED_IN]->(ep)";
8080
cql += "return ep";
8181

@@ -84,7 +84,9 @@ public void shouldFindEpisodesWhereTennantAndRoseBattleTheDaleks() throws Except
8484
Query query = parser.parse( cql );
8585
ExecutionResult result = engine.execute( query );
8686
Iterator<Node> episodes = result.javaColumnAs( "ep" );
87-
87+
// for(Node n : asIterable(episodes)){
88+
// System.out.println("--"+n.getProperty("title", "none"));
89+
// }
8890
assertThat( asIterable( episodes ),
8991
containsOnlyTitles( "Journey's End", "The Stolen Earth", "Doomsday", "Army of Ghosts", "The Parting of the Ways" ) );
9092
}
@@ -106,7 +108,7 @@ public void shouldFindTheFifthMostRecentPropToAppear() throws Exception
106108
//So, we must use prop.prop? - this fills the prop.prop column with a <null>
107109
//value for prop parts with no identifiable prop
108110

109-
cql = "start dalek = node:Species( species = 'Dalek') ";
111+
cql = "start dalek = (Species,species,\"Dalek\") ";
110112
cql += "match (dalek)-[:APPEARED_IN]->(episode)<-[:USED_IN]-(props)<-[:MEMBER_OF]-(prop) ";
111113
cql += "return prop.prop?, episode.episode order by episode.episode desc skip 4 limit 1";
112114

@@ -130,7 +132,7 @@ public void shouldFindTheHardestWorkingPropPartInShowbiz() throws Exception
130132
// YOUR CODE GOES HERE
131133
// SNIPPET_START
132134

133-
cql = "START daleks= node:Species(species = \"Dalek\") MATCH (daleks)-[:APPEARED_IN]->(episode)<-[:USED_IN]-(props)<-[:MEMBER_OF]-(prop)"
135+
cql = "START daleks= (Species,species,\"Dalek\") MATCH (daleks)-[:APPEARED_IN]->(episode)<-[:USED_IN]-(props)<-[:MEMBER_OF]-(prop)"
134136
+ "-[:COMPOSED_OF]->(part)-[:ORIGINAL_PROP]->(originalprop) RETURN originalprop.prop, part.type, COUNT(episode.title)"
135137
+ " ORDER BY COUNT(episode.title) DESC LIMIT 1";
136138

0 commit comments

Comments
 (0)