gradle build

- remove checked-in jars (except the ones loaded by tests)
- configure eclipse settings for STS

.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,3 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 19:57:59 CEST 2013
+org.springsource.ide.eclipse.gradle.rootprojectloc=

org.springsource.loaded.testdata.groovy/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-	<classpathentry kind="lib" path="groovy-1.8.2.jar" sourcepath="groovy-src-1.7.8.zip"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.springsource.loaded.testdata.groovy/.project

@@ -12,7 +12,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 	</natures>
 </projectDescription>

org.springsource.loaded.testdata.groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 20:20:55 CEST 2013
+org.springsource.ide.eclipse.gradle.linkedresources=
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

org.springsource.loaded.testdata.groovy/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "groovy"
 
 dependencies {
-	compile files("groovy-1.8.2.jar")
+	compile 'org.codehaus.groovy:groovy:1.8.2'
 }
 
 sourceSets {

org.springsource.loaded.testdata.plugin/.classpath

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry exported="true" kind="src" path="/org.springsource.loaded"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springsource.loaded"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.springsource.loaded.testdata.plugin/.project

@@ -12,6 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

org.springsource.loaded.testdata.plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 20:21:05 CEST 2013
+org.springsource.ide.eclipse.gradle.linkedresources=
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

org.springsource.loaded.testdata.subloader/.classpath

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry exported="true" kind="src" path="/org.springsource.loaded.testdata.superloader"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springsource.loaded"/>
-	<classpathentry kind="lib" path="lib/cglib-nodep-2.2.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springsource.loaded.testdata.superloader"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.springsource.loaded.testdata.subloader/.project

@@ -12,6 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

org.springsource.loaded.testdata.subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 20:21:08 CEST 2013
+org.springsource.ide.eclipse.gradle.linkedresources=
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

org.springsource.loaded.testdata.superloader/.classpath

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springsource.loaded"/>
-	<classpathentry kind="lib" path="lib/cglib-nodep-2.2.jar"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.springsource.loaded.testdata.superloader/.project

@@ -12,6 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

org.springsource.loaded.testdata.superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 20:21:11 CEST 2013
+org.springsource.ide.eclipse.gradle.linkedresources=
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

org.springsource.loaded.testdata.superloader/build.gradle

@@ -1,11 +1,3 @@
 dependencies {
-	compile "cglib:cglib:2.2.2"
-}
-
-sourceSets {
-	main {
-		java {
-			srcDir 'src'
-		}
-	}
+	compile("cglib:cglib:2.2.2") { exclude group: 'asm' } // cglib 2.2.2 depends on asm 3.3
 }

org.springsource.loaded.testdata/.classpath

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="cglibsrc"/>
-	<classpathentry kind="src" path="pluginsrc"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springsource.loaded"/>
-	<classpathentry kind="lib" path="lib/cglib-nodep-2.2.jar" sourcepath="lib/cglib-nodep-2.2-sources.jar"/>
-	<classpathentry kind="lib" path="code.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.springsource.loaded.testdata/.project

@@ -12,7 +12,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.ajdt.ui.ajnature</nature>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.ajdt.ui.ajnature</nature>
 	</natures>
 </projectDescription>

org.springsource.loaded.testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Thu Sep 05 20:20:46 CEST 2013
+org.springsource.ide.eclipse.gradle.linkedresources=
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

org.springsource.loaded.testdata/build.gradle

@@ -7,21 +7,12 @@ configurations {
 
 dependencies {
 	tools "org.aspectj:aspectjtools:$aspectjVersion"
-	compile "cglib:cglib:2.2.2"
 	compile "org.aspectj:aspectjrt:$aspectjVersion"
+	compile("cglib:cglib:2.2.2") { exclude group: 'asm' } // cglib 2.2.2 depends on asm 3.3
 	compile 'asm:asm-all:3.2'
 	compile files("code.jar")
 }
 
-sourceSets {
-	main {
-		java {
-			srcDir 'src'
-			srcDir 'cglibsrc'
-		}
-	}
-}
-
 compileJava.deleteAllActions()
 
 task aspectJ(dependsOn: JavaPlugin.PROCESS_RESOURCES_TASK_NAME)  {

org.springsource.loaded.testdata/src/com/demo/Bar.java → org.springsource.loaded.testdata/src/main/java/com/demo/Bar.java

@@ -1,11 +1,11 @@
-package com.demo;
-
-public class Bar {
-
-	private int count = 0;
-
-	public int increment() {
-		return count = count + 2;
-	}
-
+package com.demo;
+
+public class Bar {
+
+	private int count = 0;
+
+	public int increment() {
+		return count = count + 2;
+	}
+
 }

org.springsource.loaded.testdata/src/com/demo/Foo.java → org.springsource.loaded.testdata/src/main/java/com/demo/Foo.java

@@ -1,12 +1,12 @@
-package com.demo;
-
-public class Foo {
-	public static void main(String[] args) {
-		Bar bar = new Bar();
-		System.out.println(bar.increment());
-		System.out.println(bar.increment());
-		System.out.println(bar.increment());
-		System.out.println(bar.increment());
-		System.out.println(bar.increment());
-	}
-}
+package com.demo;
+
+public class Foo {
+	public static void main(String[] args) {
+		Bar bar = new Bar();
+		System.out.println(bar.increment());
+		System.out.println(bar.increment());
+		System.out.println(bar.increment());
+		System.out.println(bar.increment());
+		System.out.println(bar.increment());
+	}
+}

org.springsource.loaded.testdata/src/data/AnAspect.java → org.springsource.loaded.testdata/src/main/java/data/AnAspect.java

@@ -1,13 +1,13 @@
-package data;
-
-public aspect AnAspect {
-
-	before(): execution(!static * AspectReceiver.*(..)) {
-		System.out.println("Foo");
-	}
-
-	pointcut boo(String foo,String bar): execution(* *(..)) && args(foo,bar);
-	before(String foo): boo(foo,*) {
-
-	}
-}
+package data;
+
+public aspect AnAspect {
+
+	before(): execution(!static * AspectReceiver.*(..)) {
+		System.out.println("Foo");
+	}
+
+	pointcut boo(String foo,String bar): execution(* *(..)) && args(foo,bar);
+	before(String foo): boo(foo,*) {
+
+	}
+}

org.springsource.loaded.testdata/src/data/Anno.java → org.springsource.loaded.testdata/src/main/java/data/Anno.java

@@ -1,5 +1,5 @@
-package data;
-
-public @interface Anno {
-
-}
+package data;
+
+public @interface Anno {
+
+}

org.springsource.loaded.testdata/src/data/AnnotatedClazz.java → org.springsource.loaded.testdata/src/main/java/data/AnnotatedClazz.java

@@ -1,10 +1,10 @@
-package data;
-
-@Anno
-public class AnnotatedClazz {
-
-	@Anno
-	public void moo() {
-
-	}
-}
+package data;
+
+@Anno
+public class AnnotatedClazz {
+
+	@Anno
+	public void moo() {
+
+	}
+}

org.springsource.loaded.testdata/src/data/Apple.java → org.springsource.loaded.testdata/src/main/java/data/Apple.java

@@ -1,20 +1,20 @@
-package data;
-
-public class Apple {
-
-	public int intField;
-	public static int staticIntField;
-
-	public void run() {
-		System.out.println("Apple.run() is running ");
-	}
-
-	public String runWithReturn() {
-		return "alphabeti spaghetti";
-	}
-
-	public void runWithParam(String string) {
-		System.out.println("Apple.run(" + string + ") is running ");
-	}
-
-}
+package data;
+
+public class Apple {
+
+	public int intField;
+	public static int staticIntField;
+
+	public void run() {
+		System.out.println("Apple.run() is running ");
+	}
+
+	public String runWithReturn() {
+		return "alphabeti spaghetti";
+	}
+
+	public void runWithParam(String string) {
+		System.out.println("Apple.run(" + string + ") is running ");
+	}
+
+}