diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..96340c8 --- /dev/null +++ b/.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= diff --git a/org.springsource.loaded.testdata.groovy/.classpath b/org.springsource.loaded.testdata.groovy/.classpath index 8a3d1dc..b15c0d4 100644 --- a/org.springsource.loaded.testdata.groovy/.classpath +++ b/org.springsource.loaded.testdata.groovy/.classpath @@ -2,8 +2,8 @@ - - + + diff --git a/org.springsource.loaded.testdata.groovy/.project b/org.springsource.loaded.testdata.groovy/.project index e7ed4af..08e18ff 100644 --- a/org.springsource.loaded.testdata.groovy/.project +++ b/org.springsource.loaded.testdata.groovy/.project @@ -12,7 +12,8 @@ - org.eclipse.jdt.groovy.core.groovyNature + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature + org.eclipse.jdt.groovy.core.groovyNature diff --git a/org.springsource.loaded.testdata.groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded.testdata.groovy/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..0ddf577 --- /dev/null +++ b/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=.. diff --git a/org.springsource.loaded.testdata.groovy/build.gradle b/org.springsource.loaded.testdata.groovy/build.gradle index 7983c28..aa1cfdb 100644 --- a/org.springsource.loaded.testdata.groovy/build.gradle +++ b/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 { diff --git a/org.springsource.loaded.testdata.groovy/groovy-1.7.5.jar b/org.springsource.loaded.testdata.groovy/groovy-1.7.5.jar deleted file mode 100644 index 39cf7e4..0000000 Binary files a/org.springsource.loaded.testdata.groovy/groovy-1.7.5.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.groovy/groovy-1.7.8.jar b/org.springsource.loaded.testdata.groovy/groovy-1.7.8.jar deleted file mode 100644 index 36aed5a..0000000 Binary files a/org.springsource.loaded.testdata.groovy/groovy-1.7.8.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.groovy/groovy-src-1.7.8.zip b/org.springsource.loaded.testdata.groovy/groovy-src-1.7.8.zip deleted file mode 100644 index c533eba..0000000 Binary files a/org.springsource.loaded.testdata.groovy/groovy-src-1.7.8.zip and /dev/null differ diff --git a/org.springsource.loaded.testdata.plugin/.classpath b/org.springsource.loaded.testdata.plugin/.classpath index 599772f..d38fca2 100644 --- a/org.springsource.loaded.testdata.plugin/.classpath +++ b/org.springsource.loaded.testdata.plugin/.classpath @@ -1,7 +1,8 @@ - + + - + diff --git a/org.springsource.loaded.testdata.plugin/.project b/org.springsource.loaded.testdata.plugin/.project index e3e96c7..fb85425 100644 --- a/org.springsource.loaded.testdata.plugin/.project +++ b/org.springsource.loaded.testdata.plugin/.project @@ -12,6 +12,7 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature diff --git a/org.springsource.loaded.testdata.plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded.testdata.plugin/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..c87859b --- /dev/null +++ b/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=.. diff --git a/org.springsource.loaded.testdata.plugin/src/com/test/plugins/ReloadEventProcessorPlugin1.java b/org.springsource.loaded.testdata.plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java similarity index 100% rename from org.springsource.loaded.testdata.plugin/src/com/test/plugins/ReloadEventProcessorPlugin1.java rename to org.springsource.loaded.testdata.plugin/src/main/java/com/test/plugins/ReloadEventProcessorPlugin1.java diff --git a/org.springsource.loaded.testdata.subloader/.classpath b/org.springsource.loaded.testdata.subloader/.classpath index 18034aa..787b8ed 100644 --- a/org.springsource.loaded.testdata.subloader/.classpath +++ b/org.springsource.loaded.testdata.subloader/.classpath @@ -1,9 +1,8 @@ - + + - - - + diff --git a/org.springsource.loaded.testdata.subloader/.project b/org.springsource.loaded.testdata.subloader/.project index dfdd770..125afd5 100644 --- a/org.springsource.loaded.testdata.subloader/.project +++ b/org.springsource.loaded.testdata.subloader/.project @@ -12,6 +12,7 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature diff --git a/org.springsource.loaded.testdata.subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded.testdata.subloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..594c26d --- /dev/null +++ b/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=.. diff --git a/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2-sources.jar b/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2-sources.jar deleted file mode 100644 index 6cc192b..0000000 Binary files a/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2-sources.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2.jar b/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2.jar deleted file mode 100644 index ed07cb5..0000000 Binary files a/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Bottom.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom002.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom002.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Bottom002.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom002.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom003.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom003.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Bottom003.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Bottom003.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/BottomB.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/BottomB.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/BottomB002.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB002.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/BottomB002.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/BottomB002.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Invoker.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Invoker.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Invoker002.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker002.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Invoker002.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Invoker002.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB002.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB002.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB002.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerB002.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC002.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC002.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC002.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC002.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC003.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC003.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC003.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerC003.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerD.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerD.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/InvokerD.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/InvokerD.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/ProxyBuilder.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyBuilder.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/ProxyBuilder.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyBuilder.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/ProxyTestcase.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyTestcase.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/ProxyTestcase.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/ProxyTestcase.java diff --git a/org.springsource.loaded.testdata.subloader/src/subpkg/Subby.java b/org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Subby.java similarity index 100% rename from org.springsource.loaded.testdata.subloader/src/subpkg/Subby.java rename to org.springsource.loaded.testdata.subloader/src/main/java/subpkg/Subby.java diff --git a/org.springsource.loaded.testdata.superloader/.classpath b/org.springsource.loaded.testdata.superloader/.classpath index b5f66f0..806897a 100644 --- a/org.springsource.loaded.testdata.superloader/.classpath +++ b/org.springsource.loaded.testdata.superloader/.classpath @@ -1,8 +1,7 @@ - + - - + diff --git a/org.springsource.loaded.testdata.superloader/.project b/org.springsource.loaded.testdata.superloader/.project index 343fb9e..37bb365 100644 --- a/org.springsource.loaded.testdata.superloader/.project +++ b/org.springsource.loaded.testdata.superloader/.project @@ -12,6 +12,7 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature diff --git a/org.springsource.loaded.testdata.superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded.testdata.superloader/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..995114d --- /dev/null +++ b/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=.. diff --git a/org.springsource.loaded.testdata.superloader/build.gradle b/org.springsource.loaded.testdata.superloader/build.gradle index bb7266b..922b01d 100644 --- a/org.springsource.loaded.testdata.superloader/build.gradle +++ b/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 } diff --git a/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2-sources.jar b/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2-sources.jar deleted file mode 100644 index 6cc192b..0000000 Binary files a/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2-sources.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2.jar b/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2.jar deleted file mode 100644 index ed07cb5..0000000 Binary files a/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/MyMethodInterceptor.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/MyMethodInterceptor.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/MyMethodInterceptor.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/MyMethodInterceptor.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Simple.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Simple.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Simple.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Simple.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Target.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Target.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Target002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Target002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Target002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetB.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetB.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetB002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetB002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetB002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetC.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetC.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetC002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetC002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetC002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetD.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetD.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetD002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetD002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetD002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TargetImplC002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Top.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Top.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Top002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Top002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top002.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/Top003.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top003.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/Top003.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/Top003.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TopB.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TopB.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB.java diff --git a/org.springsource.loaded.testdata.superloader/src/superpkg/TopB002.java b/org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB002.java similarity index 100% rename from org.springsource.loaded.testdata.superloader/src/superpkg/TopB002.java rename to org.springsource.loaded.testdata.superloader/src/main/java/superpkg/TopB002.java diff --git a/org.springsource.loaded.testdata/.classpath b/org.springsource.loaded.testdata/.classpath index 87fe2cb..01992b9 100644 --- a/org.springsource.loaded.testdata/.classpath +++ b/org.springsource.loaded.testdata/.classpath @@ -1,12 +1,8 @@ - - - - + - - - + + diff --git a/org.springsource.loaded.testdata/.project b/org.springsource.loaded.testdata/.project index a01a3c2..deb47bc 100644 --- a/org.springsource.loaded.testdata/.project +++ b/org.springsource.loaded.testdata/.project @@ -12,7 +12,8 @@ - org.eclipse.ajdt.ui.ajnature + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature + org.eclipse.ajdt.ui.ajnature diff --git a/org.springsource.loaded.testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded.testdata/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..fdb27f7 --- /dev/null +++ b/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=.. diff --git a/org.springsource.loaded.testdata/aspectjrt.jar b/org.springsource.loaded.testdata/aspectjrt.jar deleted file mode 100644 index 2bdab5a..0000000 Binary files a/org.springsource.loaded.testdata/aspectjrt.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata/build.gradle b/org.springsource.loaded.testdata/build.gradle index b5ec123..200dfa2 100644 --- a/org.springsource.loaded.testdata/build.gradle +++ b/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) { diff --git a/org.springsource.loaded.testdata/lib/cglib-nodep-2.2-sources.jar b/org.springsource.loaded.testdata/lib/cglib-nodep-2.2-sources.jar deleted file mode 100644 index 6cc192b..0000000 Binary files a/org.springsource.loaded.testdata/lib/cglib-nodep-2.2-sources.jar and /dev/null differ diff --git a/org.springsource.loaded.testdata/pluginsrc/com/test/plugins/ReloadEventProcessorPlugin1.java b/org.springsource.loaded.testdata/pluginsrc/com/test/plugins/ReloadEventProcessorPlugin1.java deleted file mode 100644 index 425ec04..0000000 --- a/org.springsource.loaded.testdata/pluginsrc/com/test/plugins/ReloadEventProcessorPlugin1.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SpringSource. All rights reserved. - *******************************************************************************/ -package com.test.plugins; - -import org.springsource.loaded.ReloadEventProcessorPlugin; -import org.springsource.loaded.TypeDelta; -import org.springsource.loaded.UnableToReloadEventProcessorPlugin; - -/** - * - * @author Andy Clement - * @since 0.7.2 - */ -public class ReloadEventProcessorPlugin1 implements ReloadEventProcessorPlugin, UnableToReloadEventProcessorPlugin { - - public ReloadEventProcessorPlugin1() { - System.out.println("Instantiated ReloadEventProcessorPlugin1"); - } - - public void reloadEvent(String typename, Class clazz, String encodedTimestamp) { - System.out.println("ReloadEventProcessorPlugin1: reloadEvent(" + typename + "," + clazz.getName() + "," + encodedTimestamp - + ")"); - } - - public void unableToReloadEvent(String typename, Class clazz, TypeDelta typeDelta, String encodedTimestamp) { - System.out.println("ReloadEventProcessorPlugin1: unableToReloadEvent(" + typename + "," + clazz.getName() + "," - + encodedTimestamp + ")"); - } - - @Override - public boolean shouldRerunStaticInitializer(String typename, Class clazz, String encodedTimestamp) { - System.out.println("ReloadEventProcessorPlugin1: shouldRerunStaticInitializer(" + typename + "," + clazz.getName() + "," - + encodedTimestamp + ")"); - return false; - } - -} diff --git a/org.springsource.loaded.testdata/src/abs/AbsImpl.java b/org.springsource.loaded.testdata/src/main/java/abs/AbsImpl.java similarity index 100% rename from org.springsource.loaded.testdata/src/abs/AbsImpl.java rename to org.springsource.loaded.testdata/src/main/java/abs/AbsImpl.java diff --git a/org.springsource.loaded.testdata/src/abs/AbsImpl2.java b/org.springsource.loaded.testdata/src/main/java/abs/AbsImpl2.java similarity index 100% rename from org.springsource.loaded.testdata/src/abs/AbsImpl2.java rename to org.springsource.loaded.testdata/src/main/java/abs/AbsImpl2.java diff --git a/org.springsource.loaded.testdata/src/abs/Impl.java b/org.springsource.loaded.testdata/src/main/java/abs/Impl.java similarity index 100% rename from org.springsource.loaded.testdata/src/abs/Impl.java rename to org.springsource.loaded.testdata/src/main/java/abs/Impl.java diff --git a/org.springsource.loaded.testdata/src/abs/Impl2.java b/org.springsource.loaded.testdata/src/main/java/abs/Impl2.java similarity index 100% rename from org.springsource.loaded.testdata/src/abs/Impl2.java rename to org.springsource.loaded.testdata/src/main/java/abs/Impl2.java diff --git a/org.springsource.loaded.testdata/src/abs/Intface.java b/org.springsource.loaded.testdata/src/main/java/abs/Intface.java similarity index 100% rename from org.springsource.loaded.testdata/src/abs/Intface.java rename to org.springsource.loaded.testdata/src/main/java/abs/Intface.java diff --git a/org.springsource.loaded.testdata/src/accessors/DefaultFields.java b/org.springsource.loaded.testdata/src/main/java/accessors/DefaultFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/accessors/DefaultFields.java rename to org.springsource.loaded.testdata/src/main/java/accessors/DefaultFields.java diff --git a/org.springsource.loaded.testdata/src/accessors/DefaultFieldsSub.java b/org.springsource.loaded.testdata/src/main/java/accessors/DefaultFieldsSub.java similarity index 100% rename from org.springsource.loaded.testdata/src/accessors/DefaultFieldsSub.java rename to org.springsource.loaded.testdata/src/main/java/accessors/DefaultFieldsSub.java diff --git a/org.springsource.loaded.testdata/src/accessors/PrivateFields.java b/org.springsource.loaded.testdata/src/main/java/accessors/PrivateFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/accessors/PrivateFields.java rename to org.springsource.loaded.testdata/src/main/java/accessors/PrivateFields.java diff --git a/org.springsource.loaded.testdata/src/accessors/ProtectedFields.java b/org.springsource.loaded.testdata/src/main/java/accessors/ProtectedFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/accessors/ProtectedFields.java rename to org.springsource.loaded.testdata/src/main/java/accessors/ProtectedFields.java diff --git a/org.springsource.loaded.testdata/src/annos/AnnotatedType.java b/org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/AnnotatedType.java rename to org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType.java diff --git a/org.springsource.loaded.testdata/src/annos/AnnotatedType2.java b/org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType2.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/AnnotatedType2.java rename to org.springsource.loaded.testdata/src/main/java/annos/AnnotatedType2.java diff --git a/org.springsource.loaded.testdata/src/annos/Foo2.java b/org.springsource.loaded.testdata/src/main/java/annos/Foo2.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/Foo2.java rename to org.springsource.loaded.testdata/src/main/java/annos/Foo2.java diff --git a/org.springsource.loaded.testdata/src/annos/Play.java b/org.springsource.loaded.testdata/src/main/java/annos/Play.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/Play.java rename to org.springsource.loaded.testdata/src/main/java/annos/Play.java diff --git a/org.springsource.loaded.testdata/src/annos/Play2.java b/org.springsource.loaded.testdata/src/main/java/annos/Play2.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/Play2.java rename to org.springsource.loaded.testdata/src/main/java/annos/Play2.java diff --git a/org.springsource.loaded.testdata/src/annos/SimpleAnnotation.java b/org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/SimpleAnnotation.java rename to org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation.java diff --git a/org.springsource.loaded.testdata/src/annos/SimpleAnnotation2.java b/org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation2.java similarity index 100% rename from org.springsource.loaded.testdata/src/annos/SimpleAnnotation2.java rename to org.springsource.loaded.testdata/src/main/java/annos/SimpleAnnotation2.java diff --git a/org.springsource.loaded.testdata/src/baddata/One.java b/org.springsource.loaded.testdata/src/main/java/baddata/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/baddata/One.java rename to org.springsource.loaded.testdata/src/main/java/baddata/One.java diff --git a/org.springsource.loaded.testdata/src/baddata/OneA.java b/org.springsource.loaded.testdata/src/main/java/baddata/OneA.java similarity index 100% rename from org.springsource.loaded.testdata/src/baddata/OneA.java rename to org.springsource.loaded.testdata/src/main/java/baddata/OneA.java diff --git a/org.springsource.loaded.testdata/src/baddata/OneB.java b/org.springsource.loaded.testdata/src/main/java/baddata/OneB.java similarity index 100% rename from org.springsource.loaded.testdata/src/baddata/OneB.java rename to org.springsource.loaded.testdata/src/main/java/baddata/OneB.java diff --git a/org.springsource.loaded.testdata/src/basic/Basic.java b/org.springsource.loaded.testdata/src/main/java/basic/Basic.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Basic.java rename to org.springsource.loaded.testdata/src/main/java/basic/Basic.java diff --git a/org.springsource.loaded.testdata/src/basic/Basic002.java b/org.springsource.loaded.testdata/src/main/java/basic/Basic002.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Basic002.java rename to org.springsource.loaded.testdata/src/main/java/basic/Basic002.java diff --git a/org.springsource.loaded.testdata/src/basic/Basic003.java b/org.springsource.loaded.testdata/src/main/java/basic/Basic003.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Basic003.java rename to org.springsource.loaded.testdata/src/main/java/basic/Basic003.java diff --git a/org.springsource.loaded.testdata/src/basic/Basic004.java b/org.springsource.loaded.testdata/src/main/java/basic/Basic004.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Basic004.java rename to org.springsource.loaded.testdata/src/main/java/basic/Basic004.java diff --git a/org.springsource.loaded.testdata/src/basic/BasicB.java b/org.springsource.loaded.testdata/src/main/java/basic/BasicB.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/BasicB.java rename to org.springsource.loaded.testdata/src/main/java/basic/BasicB.java diff --git a/org.springsource.loaded.testdata/src/basic/BasicC.java b/org.springsource.loaded.testdata/src/main/java/basic/BasicC.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/BasicC.java rename to org.springsource.loaded.testdata/src/main/java/basic/BasicC.java diff --git a/org.springsource.loaded.testdata/src/basic/Bottom.java b/org.springsource.loaded.testdata/src/main/java/basic/Bottom.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Bottom.java rename to org.springsource.loaded.testdata/src/main/java/basic/Bottom.java diff --git a/org.springsource.loaded.testdata/src/basic/Bottom2.java b/org.springsource.loaded.testdata/src/main/java/basic/Bottom2.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Bottom2.java rename to org.springsource.loaded.testdata/src/main/java/basic/Bottom2.java diff --git a/org.springsource.loaded.testdata/src/basic/Top.java b/org.springsource.loaded.testdata/src/main/java/basic/Top.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Top.java rename to org.springsource.loaded.testdata/src/main/java/basic/Top.java diff --git a/org.springsource.loaded.testdata/src/basic/Top2.java b/org.springsource.loaded.testdata/src/main/java/basic/Top2.java similarity index 100% rename from org.springsource.loaded.testdata/src/basic/Top2.java rename to org.springsource.loaded.testdata/src/main/java/basic/Top2.java diff --git a/org.springsource.loaded.testdata/src/benchmarks/MethodInvoking.java b/org.springsource.loaded.testdata/src/main/java/benchmarks/MethodInvoking.java similarity index 100% rename from org.springsource.loaded.testdata/src/benchmarks/MethodInvoking.java rename to org.springsource.loaded.testdata/src/main/java/benchmarks/MethodInvoking.java diff --git a/org.springsource.loaded.testdata/src/builder/DispatcherTestOne.java b/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/builder/DispatcherTestOne.java rename to org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne.java diff --git a/org.springsource.loaded.testdata/src/builder/DispatcherTestOne002.java b/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne002.java similarity index 100% rename from org.springsource.loaded.testdata/src/builder/DispatcherTestOne002.java rename to org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne002.java diff --git a/org.springsource.loaded.testdata/src/builder/DispatcherTestOne003.java b/org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne003.java similarity index 100% rename from org.springsource.loaded.testdata/src/builder/DispatcherTestOne003.java rename to org.springsource.loaded.testdata/src/main/java/builder/DispatcherTestOne003.java diff --git a/org.springsource.loaded.testdata/src/catchers/A.java b/org.springsource.loaded.testdata/src/main/java/catchers/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/A.java rename to org.springsource.loaded.testdata/src/main/java/catchers/A.java diff --git a/org.springsource.loaded.testdata/src/catchers/B.java b/org.springsource.loaded.testdata/src/main/java/catchers/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/B.java rename to org.springsource.loaded.testdata/src/main/java/catchers/B.java diff --git a/org.springsource.loaded.testdata/src/catchers/B2.java b/org.springsource.loaded.testdata/src/main/java/catchers/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/B2.java rename to org.springsource.loaded.testdata/src/main/java/catchers/B2.java diff --git a/org.springsource.loaded.testdata/src/catchers/Bottom.java b/org.springsource.loaded.testdata/src/main/java/catchers/Bottom.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Bottom.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Bottom.java diff --git a/org.springsource.loaded.testdata/src/catchers/Finality.java b/org.springsource.loaded.testdata/src/main/java/catchers/Finality.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Finality.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Finality.java diff --git a/org.springsource.loaded.testdata/src/catchers/Middle.java b/org.springsource.loaded.testdata/src/main/java/catchers/Middle.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Middle.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Middle.java diff --git a/org.springsource.loaded.testdata/src/catchers/Runner.java b/org.springsource.loaded.testdata/src/main/java/catchers/Runner.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Runner.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Runner.java diff --git a/org.springsource.loaded.testdata/src/catchers/Runner2.java b/org.springsource.loaded.testdata/src/main/java/catchers/Runner2.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Runner2.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Runner2.java diff --git a/org.springsource.loaded.testdata/src/catchers/SimpleCatcher.java b/org.springsource.loaded.testdata/src/main/java/catchers/SimpleCatcher.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/SimpleCatcher.java rename to org.springsource.loaded.testdata/src/main/java/catchers/SimpleCatcher.java diff --git a/org.springsource.loaded.testdata/src/catchers/Top.java b/org.springsource.loaded.testdata/src/main/java/catchers/Top.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Top.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Top.java diff --git a/org.springsource.loaded.testdata/src/catchers/X.java b/org.springsource.loaded.testdata/src/main/java/catchers/X.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/X.java rename to org.springsource.loaded.testdata/src/main/java/catchers/X.java diff --git a/org.springsource.loaded.testdata/src/catchers/Y.java b/org.springsource.loaded.testdata/src/main/java/catchers/Y.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Y.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Y.java diff --git a/org.springsource.loaded.testdata/src/catchers/Y2.java b/org.springsource.loaded.testdata/src/main/java/catchers/Y2.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Y2.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Y2.java diff --git a/org.springsource.loaded.testdata/src/catchers/Z.java b/org.springsource.loaded.testdata/src/main/java/catchers/Z.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/Z.java rename to org.springsource.loaded.testdata/src/main/java/catchers/Z.java diff --git a/org.springsource.loaded.testdata/src/catchers/play.class b/org.springsource.loaded.testdata/src/main/java/catchers/play.class similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/play.class rename to org.springsource.loaded.testdata/src/main/java/catchers/play.class diff --git a/org.springsource.loaded.testdata/src/catchers/play.java b/org.springsource.loaded.testdata/src/main/java/catchers/play.java similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/play.java rename to org.springsource.loaded.testdata/src/main/java/catchers/play.java diff --git a/org.springsource.loaded.testdata/src/catchers/x.class b/org.springsource.loaded.testdata/src/main/java/catchers/x.class similarity index 100% rename from org.springsource.loaded.testdata/src/catchers/x.class rename to org.springsource.loaded.testdata/src/main/java/catchers/x.class diff --git a/org.springsource.loaded.testdata/src/clinit/One.java b/org.springsource.loaded.testdata/src/main/java/clinit/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/One.java rename to org.springsource.loaded.testdata/src/main/java/clinit/One.java diff --git a/org.springsource.loaded.testdata/src/clinit/One2.java b/org.springsource.loaded.testdata/src/main/java/clinit/One2.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/One2.java rename to org.springsource.loaded.testdata/src/main/java/clinit/One2.java diff --git a/org.springsource.loaded.testdata/src/clinit/Three.java b/org.springsource.loaded.testdata/src/main/java/clinit/Three.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/Three.java rename to org.springsource.loaded.testdata/src/main/java/clinit/Three.java diff --git a/org.springsource.loaded.testdata/src/clinit/Three2.java b/org.springsource.loaded.testdata/src/main/java/clinit/Three2.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/Three2.java rename to org.springsource.loaded.testdata/src/main/java/clinit/Three2.java diff --git a/org.springsource.loaded.testdata/src/clinit/Three3.java b/org.springsource.loaded.testdata/src/main/java/clinit/Three3.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/Three3.java rename to org.springsource.loaded.testdata/src/main/java/clinit/Three3.java diff --git a/org.springsource.loaded.testdata/src/clinit/Two.java b/org.springsource.loaded.testdata/src/main/java/clinit/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/Two.java rename to org.springsource.loaded.testdata/src/main/java/clinit/Two.java diff --git a/org.springsource.loaded.testdata/src/clinit/Two2.java b/org.springsource.loaded.testdata/src/main/java/clinit/Two2.java similarity index 100% rename from org.springsource.loaded.testdata/src/clinit/Two2.java rename to org.springsource.loaded.testdata/src/main/java/clinit/Two2.java diff --git a/org.springsource.loaded.testdata/src/codegen/Simple.java b/org.springsource.loaded.testdata/src/main/java/codegen/Simple.java similarity index 100% rename from org.springsource.loaded.testdata/src/codegen/Simple.java rename to org.springsource.loaded.testdata/src/main/java/codegen/Simple.java diff --git a/org.springsource.loaded.testdata/src/com/demo/Bar.java b/org.springsource.loaded.testdata/src/main/java/com/demo/Bar.java similarity index 92% rename from org.springsource.loaded.testdata/src/com/demo/Bar.java rename to org.springsource.loaded.testdata/src/main/java/com/demo/Bar.java index 325cb07..0b8fd1e 100644 --- a/org.springsource.loaded.testdata/src/com/demo/Bar.java +++ b/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; + } + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/com/demo/Foo.java b/org.springsource.loaded.testdata/src/main/java/com/demo/Foo.java similarity index 96% rename from org.springsource.loaded.testdata/src/com/demo/Foo.java rename to org.springsource.loaded.testdata/src/main/java/com/demo/Foo.java index 92aa5b1..e16b868 100644 --- a/org.springsource.loaded.testdata/src/com/demo/Foo.java +++ b/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()); + } +} diff --git a/org.springsource.loaded.testdata/src/common/Anno.java b/org.springsource.loaded.testdata/src/main/java/common/Anno.java similarity index 100% rename from org.springsource.loaded.testdata/src/common/Anno.java rename to org.springsource.loaded.testdata/src/main/java/common/Anno.java diff --git a/org.springsource.loaded.testdata/src/common/Marker.java b/org.springsource.loaded.testdata/src/main/java/common/Marker.java similarity index 100% rename from org.springsource.loaded.testdata/src/common/Marker.java rename to org.springsource.loaded.testdata/src/main/java/common/Marker.java diff --git a/org.springsource.loaded.testdata/src/ctors/A.java b/org.springsource.loaded.testdata/src/main/java/ctors/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/A.java rename to org.springsource.loaded.testdata/src/main/java/ctors/A.java diff --git a/org.springsource.loaded.testdata/src/ctors/B.java b/org.springsource.loaded.testdata/src/main/java/ctors/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/B.java rename to org.springsource.loaded.testdata/src/main/java/ctors/B.java diff --git a/org.springsource.loaded.testdata/src/ctors/B2.java b/org.springsource.loaded.testdata/src/main/java/ctors/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/B2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/B2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Callee.java b/org.springsource.loaded.testdata/src/main/java/ctors/Callee.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Callee.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Callee.java diff --git a/org.springsource.loaded.testdata/src/ctors/Callee2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Callee2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Callee2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Callee2.java diff --git a/org.springsource.loaded.testdata/src/ctors/CalleeB.java b/org.springsource.loaded.testdata/src/main/java/ctors/CalleeB.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CalleeB.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CalleeB.java diff --git a/org.springsource.loaded.testdata/src/ctors/CalleeB2.java b/org.springsource.loaded.testdata/src/main/java/ctors/CalleeB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CalleeB2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CalleeB2.java diff --git a/org.springsource.loaded.testdata/src/ctors/CalleeSuperB.java b/org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CalleeSuperB.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB.java diff --git a/org.springsource.loaded.testdata/src/ctors/CalleeSuperB2.java b/org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CalleeSuperB2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CalleeSuperB2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Caller.java b/org.springsource.loaded.testdata/src/main/java/ctors/Caller.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Caller.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Caller.java diff --git a/org.springsource.loaded.testdata/src/ctors/Caller2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Caller2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Caller2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Caller2.java diff --git a/org.springsource.loaded.testdata/src/ctors/CallerB.java b/org.springsource.loaded.testdata/src/main/java/ctors/CallerB.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CallerB.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CallerB.java diff --git a/org.springsource.loaded.testdata/src/ctors/CallerB2.java b/org.springsource.loaded.testdata/src/main/java/ctors/CallerB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/CallerB2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/CallerB2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Default.java b/org.springsource.loaded.testdata/src/main/java/ctors/Default.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Default.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Default.java diff --git a/org.springsource.loaded.testdata/src/ctors/Finals.java b/org.springsource.loaded.testdata/src/main/java/ctors/Finals.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Finals.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Finals.java diff --git a/org.springsource.loaded.testdata/src/ctors/Finals2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Finals2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Finals2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Finals2.java diff --git a/org.springsource.loaded.testdata/src/ctors/JR.java b/org.springsource.loaded.testdata/src/main/java/ctors/JR.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/JR.java rename to org.springsource.loaded.testdata/src/main/java/ctors/JR.java diff --git a/org.springsource.loaded.testdata/src/ctors/JR2.java b/org.springsource.loaded.testdata/src/main/java/ctors/JR2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/JR2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/JR2.java diff --git a/org.springsource.loaded.testdata/src/ctors/One.java b/org.springsource.loaded.testdata/src/main/java/ctors/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/One.java rename to org.springsource.loaded.testdata/src/main/java/ctors/One.java diff --git a/org.springsource.loaded.testdata/src/ctors/One2.java b/org.springsource.loaded.testdata/src/main/java/ctors/One2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/One2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/One2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Setter.java b/org.springsource.loaded.testdata/src/main/java/ctors/Setter.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Setter.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Setter.java diff --git a/org.springsource.loaded.testdata/src/ctors/Setter2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Setter2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Setter2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Setter2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Setter3.java b/org.springsource.loaded.testdata/src/main/java/ctors/Setter3.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Setter3.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Setter3.java diff --git a/org.springsource.loaded.testdata/src/ctors/SuperThree.java b/org.springsource.loaded.testdata/src/main/java/ctors/SuperThree.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/SuperThree.java rename to org.springsource.loaded.testdata/src/main/java/ctors/SuperThree.java diff --git a/org.springsource.loaded.testdata/src/ctors/SuperThree2.java b/org.springsource.loaded.testdata/src/main/java/ctors/SuperThree2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/SuperThree2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/SuperThree2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Three.java b/org.springsource.loaded.testdata/src/main/java/ctors/Three.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Three.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Three.java diff --git a/org.springsource.loaded.testdata/src/ctors/Three2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Three2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Three2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Three2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Two.class b/org.springsource.loaded.testdata/src/main/java/ctors/Two.class similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Two.class rename to org.springsource.loaded.testdata/src/main/java/ctors/Two.class diff --git a/org.springsource.loaded.testdata/src/ctors/Two.java b/org.springsource.loaded.testdata/src/main/java/ctors/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Two.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Two.java diff --git a/org.springsource.loaded.testdata/src/ctors/Two2.java b/org.springsource.loaded.testdata/src/main/java/ctors/Two2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Two2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Two2.java diff --git a/org.springsource.loaded.testdata/src/ctors/Utils.java b/org.springsource.loaded.testdata/src/main/java/ctors/Utils.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/Utils.java rename to org.springsource.loaded.testdata/src/main/java/ctors/Utils.java diff --git a/org.springsource.loaded.testdata/src/ctors/V.java b/org.springsource.loaded.testdata/src/main/java/ctors/V.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/V.java rename to org.springsource.loaded.testdata/src/main/java/ctors/V.java diff --git a/org.springsource.loaded.testdata/src/ctors/V2.java b/org.springsource.loaded.testdata/src/main/java/ctors/V2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/V2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/V2.java diff --git a/org.springsource.loaded.testdata/src/ctors/V3.java b/org.springsource.loaded.testdata/src/main/java/ctors/V3.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/V3.java rename to org.springsource.loaded.testdata/src/main/java/ctors/V3.java diff --git a/org.springsource.loaded.testdata/src/ctors/XX.java b/org.springsource.loaded.testdata/src/main/java/ctors/XX.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/XX.java rename to org.springsource.loaded.testdata/src/main/java/ctors/XX.java diff --git a/org.springsource.loaded.testdata/src/ctors/XX2.java b/org.springsource.loaded.testdata/src/main/java/ctors/XX2.java similarity index 100% rename from org.springsource.loaded.testdata/src/ctors/XX2.java rename to org.springsource.loaded.testdata/src/main/java/ctors/XX2.java diff --git a/org.springsource.loaded.testdata/src/data/AnAspect.java b/org.springsource.loaded.testdata/src/main/java/data/AnAspect.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/AnAspect.java rename to org.springsource.loaded.testdata/src/main/java/data/AnAspect.java index 7123b99..2085cd5 100644 --- a/org.springsource.loaded.testdata/src/data/AnAspect.java +++ b/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,*) { + + } +} diff --git a/org.springsource.loaded.testdata/src/data/Anno.java b/org.springsource.loaded.testdata/src/main/java/data/Anno.java similarity index 89% rename from org.springsource.loaded.testdata/src/data/Anno.java rename to org.springsource.loaded.testdata/src/main/java/data/Anno.java index 3bc3c64..6e4c028 100644 --- a/org.springsource.loaded.testdata/src/data/Anno.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Anno.java @@ -1,5 +1,5 @@ -package data; - -public @interface Anno { - -} +package data; + +public @interface Anno { + +} diff --git a/org.springsource.loaded.testdata/src/data/AnnotatedClazz.java b/org.springsource.loaded.testdata/src/main/java/data/AnnotatedClazz.java similarity index 89% rename from org.springsource.loaded.testdata/src/data/AnnotatedClazz.java rename to org.springsource.loaded.testdata/src/main/java/data/AnnotatedClazz.java index c9768d9..1737324 100644 --- a/org.springsource.loaded.testdata/src/data/AnnotatedClazz.java +++ b/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() { + + } +} diff --git a/org.springsource.loaded.testdata/src/data/Apple.java b/org.springsource.loaded.testdata/src/main/java/data/Apple.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Apple.java rename to org.springsource.loaded.testdata/src/main/java/data/Apple.java index cb746df..5ad3b54 100644 --- a/org.springsource.loaded.testdata/src/data/Apple.java +++ b/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 "); + } + +} diff --git a/org.springsource.loaded.testdata/src/data/Apple002.java b/org.springsource.loaded.testdata/src/main/java/data/Apple002.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Apple002.java rename to org.springsource.loaded.testdata/src/main/java/data/Apple002.java index 1949163..8a0cf9b 100644 --- a/org.springsource.loaded.testdata/src/data/Apple002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Apple002.java @@ -1,67 +1,67 @@ -package data; - -public class Apple002 { - - public int intField; - public static int staticIntField; - - public void run() { - System.out.println("Apple002.run() is running "); - } - - public String run(String a, Integer b, String c, Integer d) { - return a + " " + b + " " + c + " " + d; - } - - public String run2(int i) { - return "run2 " + i; - } - - public int run3(int i) { - return i * 2; - } - - public static int run4(int i) { - return i * 2; - } - - public Boolean runGetBoolean(boolean i) { - return !i; - } - - public short runGetShort(short i) { - return (short) (i * 2); - } - - public float runGetFloat(float i) { - return i * 2; - } - - public long runGetLong(long i) { - return i * 2; - } - - public double runGetDouble(double i) { - return i * 2; - } - - public char runGetChar(char i) { - return (char) (i + 1); - } - - public byte runGetByte(byte i) { - return (byte) (i * 2); - } - - public int[] runGetArrayInt(int[] is) { - return is; - } - - public String[] runGetArrayString(String[] is) { - return is; - } - - public String run(String s, int i, double d, String t, int[] is) { - return s + i + d + t + is[0]; - } -} +package data; + +public class Apple002 { + + public int intField; + public static int staticIntField; + + public void run() { + System.out.println("Apple002.run() is running "); + } + + public String run(String a, Integer b, String c, Integer d) { + return a + " " + b + " " + c + " " + d; + } + + public String run2(int i) { + return "run2 " + i; + } + + public int run3(int i) { + return i * 2; + } + + public static int run4(int i) { + return i * 2; + } + + public Boolean runGetBoolean(boolean i) { + return !i; + } + + public short runGetShort(short i) { + return (short) (i * 2); + } + + public float runGetFloat(float i) { + return i * 2; + } + + public long runGetLong(long i) { + return i * 2; + } + + public double runGetDouble(double i) { + return i * 2; + } + + public char runGetChar(char i) { + return (char) (i + 1); + } + + public byte runGetByte(byte i) { + return (byte) (i * 2); + } + + public int[] runGetArrayInt(int[] is) { + return is; + } + + public String[] runGetArrayString(String[] is) { + return is; + } + + public String run(String s, int i, double d, String t, int[] is) { + return s + i + d + t + is[0]; + } +} diff --git a/org.springsource.loaded.testdata/src/data/Apple003.java b/org.springsource.loaded.testdata/src/main/java/data/Apple003.java similarity index 92% rename from org.springsource.loaded.testdata/src/data/Apple003.java rename to org.springsource.loaded.testdata/src/main/java/data/Apple003.java index c2c8692..ea82a87 100644 --- a/org.springsource.loaded.testdata/src/data/Apple003.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Apple003.java @@ -1,9 +1,9 @@ -package data; - -public class Apple003 { - - public void run() { - System.out.println("Apple003.run() is running"); - } - -} +package data; + +public class Apple003 { + + public void run() { + System.out.println("Apple003.run() is running"); + } + +} diff --git a/org.springsource.loaded.testdata/src/data/AspectReceiver.java b/org.springsource.loaded.testdata/src/main/java/data/AspectReceiver.java similarity index 92% rename from org.springsource.loaded.testdata/src/data/AspectReceiver.java rename to org.springsource.loaded.testdata/src/main/java/data/AspectReceiver.java index b58bf72..518e074 100644 --- a/org.springsource.loaded.testdata/src/data/AspectReceiver.java +++ b/org.springsource.loaded.testdata/src/main/java/data/AspectReceiver.java @@ -1,15 +1,15 @@ -package data; - -public class AspectReceiver { - - public static void main2() { - main(null); - } - - public static void main(String[] args) { - new AspectReceiver().foo(); - } - - public void foo() { - } -} +package data; + +public class AspectReceiver { + + public static void main2() { + main(null); + } + + public static void main(String[] args) { + new AspectReceiver().foo(); + } + + public void foo() { + } +} diff --git a/org.springsource.loaded.testdata/src/data/Banana.java b/org.springsource.loaded.testdata/src/main/java/data/Banana.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/Banana.java rename to org.springsource.loaded.testdata/src/main/java/data/Banana.java index 83b42af..0674758 100644 --- a/org.springsource.loaded.testdata/src/data/Banana.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Banana.java @@ -1,23 +1,23 @@ -package data; - -public class Banana { - - Pear p = new Pear(); - - public int[] getIntArrayField() { - return p.intArray; - } - - public void setIntArrayField(int[] is) { - p.intArray = is; - } - - public static int[] getStaticIntArrayField() { - return Pear.staticIntArray; - } - - public static void setStaticIntArrayField(int[] is) { - Pear.staticIntArray = is; - } - -} +package data; + +public class Banana { + + Pear p = new Pear(); + + public int[] getIntArrayField() { + return p.intArray; + } + + public void setIntArrayField(int[] is) { + p.intArray = is; + } + + public static int[] getStaticIntArrayField() { + return Pear.staticIntArray; + } + + public static void setStaticIntArrayField(int[] is) { + Pear.staticIntArray = is; + } + +} diff --git a/org.springsource.loaded.testdata/src/data/BottomType.java b/org.springsource.loaded.testdata/src/main/java/data/BottomType.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/BottomType.java rename to org.springsource.loaded.testdata/src/main/java/data/BottomType.java diff --git a/org.springsource.loaded.testdata/src/data/ComplexClass.java b/org.springsource.loaded.testdata/src/main/java/data/ComplexClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/ComplexClass.java rename to org.springsource.loaded.testdata/src/main/java/data/ComplexClass.java diff --git a/org.springsource.loaded.testdata/src/data/DemoMethods.java b/org.springsource.loaded.testdata/src/main/java/data/DemoMethods.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/DemoMethods.java rename to org.springsource.loaded.testdata/src/main/java/data/DemoMethods.java index ef0ee41..bb4cab3 100644 --- a/org.springsource.loaded.testdata/src/data/DemoMethods.java +++ b/org.springsource.loaded.testdata/src/main/java/data/DemoMethods.java @@ -1,28 +1,28 @@ -package data; - -public class DemoMethods { - - public static void main(String[] args) throws Exception { - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - print("Hello World"); - } - - public static void print(String message) { - System.out.println(upperize(message)); - } - - private static String upperize(String message) { - return message.toUpperCase(); - } - +package data; + +public class DemoMethods { + + public static void main(String[] args) throws Exception { + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + print("Hello World"); + } + + public static void print(String message) { + System.out.println(upperize(message)); + } + + private static String upperize(String message) { + return message.toUpperCase(); + } + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/DemoMethods2.java b/org.springsource.loaded.testdata/src/main/java/data/DemoMethods2.java similarity index 96% rename from org.springsource.loaded.testdata/src/data/DemoMethods2.java rename to org.springsource.loaded.testdata/src/main/java/data/DemoMethods2.java index 8416219..ad8cd59 100644 --- a/org.springsource.loaded.testdata/src/data/DemoMethods2.java +++ b/org.springsource.loaded.testdata/src/main/java/data/DemoMethods2.java @@ -1,45 +1,45 @@ -package data; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - -public class DemoMethods2 { - - public static void main(String[] args) throws Exception { - getDeclaredMethod("foo"); - getDeclaredMethod("foo"); - getDeclaredMethod("foo"); - getDeclaredMethod("foo"); - System.out.println(getFirstDeclaredAnnotation("foo")); - System.out.println(getFirstDeclaredAnnotation("foo")); - System.out.println(getFirstDeclaredAnnotation("foo")); - System.out.println(getFirstDeclaredAnnotation("foo")); - System.out.println(getFirstDeclaredAnnotation("foo")); - } - - @Wiggle("asc") - public void foo() { - - } - - public static Method getDeclaredMethod(String name) { - try { - Method m = DemoMethods2.class.getDeclaredMethod(name); - System.out.println("returning " + m); - return m; - } catch (NoSuchMethodException nsme) { - System.out.println("No such method called foo"); - return null; - } - } - - public static Annotation getFirstDeclaredAnnotation(String name) throws Exception { - Annotation[] annos = getDeclaredMethod(name).getDeclaredAnnotations(); - if (annos == null || annos.length == 0) { - return null; - } else { - return annos[0]; - } - } - +package data; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + +public class DemoMethods2 { + + public static void main(String[] args) throws Exception { + getDeclaredMethod("foo"); + getDeclaredMethod("foo"); + getDeclaredMethod("foo"); + getDeclaredMethod("foo"); + System.out.println(getFirstDeclaredAnnotation("foo")); + System.out.println(getFirstDeclaredAnnotation("foo")); + System.out.println(getFirstDeclaredAnnotation("foo")); + System.out.println(getFirstDeclaredAnnotation("foo")); + System.out.println(getFirstDeclaredAnnotation("foo")); + } + + @Wiggle("asc") + public void foo() { + + } + + public static Method getDeclaredMethod(String name) { + try { + Method m = DemoMethods2.class.getDeclaredMethod(name); + System.out.println("returning " + m); + return m; + } catch (NoSuchMethodException nsme) { + System.out.println("No such method called foo"); + return null; + } + } + + public static Annotation getFirstDeclaredAnnotation(String name) throws Exception { + Annotation[] annos = getDeclaredMethod(name).getDeclaredAnnotations(); + if (annos == null || annos.length == 0) { + return null; + } else { + return annos[0]; + } + } + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/FieldsB.java b/org.springsource.loaded.testdata/src/main/java/data/FieldsB.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/FieldsB.java rename to org.springsource.loaded.testdata/src/main/java/data/FieldsB.java diff --git a/org.springsource.loaded.testdata/src/data/Foo.java b/org.springsource.loaded.testdata/src/main/java/data/Foo.java similarity index 97% rename from org.springsource.loaded.testdata/src/data/Foo.java rename to org.springsource.loaded.testdata/src/main/java/data/Foo.java index 4200cd6..0cdf469 100644 --- a/org.springsource.loaded.testdata/src/data/Foo.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Foo.java @@ -1,32 +1,32 @@ -package data; - - -public class Foo { - - public static void main(String[] args) throws Exception { - print("Hello"); - print("World"); - - System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); - } - - public static void print(String message) { - System.out.println();// dosomethingwithit(message)); - } - - // private static String dosomethingwithit(String message) { - // return message.toUpperCase(); - // } - - @Wiggle - int i; -} +package data; + + +public class Foo { + + public static void main(String[] args) throws Exception { + print("Hello"); + print("World"); + + System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i")); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + System.out.println("Annotations: " + Foo.class.getDeclaredField("i").getAnnotation(Wiggle.class)); + } + + public static void print(String message) { + System.out.println();// dosomethingwithit(message)); + } + + // private static String dosomethingwithit(String message) { + // return message.toUpperCase(); + // } + + @Wiggle + int i; +} diff --git a/org.springsource.loaded.testdata/src/data/Fruity.java b/org.springsource.loaded.testdata/src/main/java/data/Fruity.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Fruity.java rename to org.springsource.loaded.testdata/src/main/java/data/Fruity.java index 8021c07..9ada197 100644 --- a/org.springsource.loaded.testdata/src/data/Fruity.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Fruity.java @@ -1,12 +1,12 @@ -package data; - -/** - * Simple test class with one method returning a String - * - * @author Andy Clement - */ -public class Fruity { - public String getFruit() { - return "apple"; - } +package data; + +/** + * Simple test class with one method returning a String + * + * @author Andy Clement + */ +public class Fruity { + public String getFruit() { + return "apple"; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/Fruity002.java b/org.springsource.loaded.testdata/src/main/java/data/Fruity002.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Fruity002.java rename to org.springsource.loaded.testdata/src/main/java/data/Fruity002.java index cd6d61a..7ef69bf 100644 --- a/org.springsource.loaded.testdata/src/data/Fruity002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Fruity002.java @@ -1,12 +1,12 @@ -package data; - -/** - * Simple test class with one method returning a String - * - * @author Andy Clement - */ -public class Fruity002 { - public String getFruit() { - return "orange"; - } +package data; + +/** + * Simple test class with one method returning a String + * + * @author Andy Clement + */ +public class Fruity002 { + public String getFruit() { + return "orange"; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/Fruity003.java b/org.springsource.loaded.testdata/src/main/java/data/Fruity003.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Fruity003.java rename to org.springsource.loaded.testdata/src/main/java/data/Fruity003.java index c4ead71..fdcbb5a 100644 --- a/org.springsource.loaded.testdata/src/data/Fruity003.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Fruity003.java @@ -1,12 +1,12 @@ -package data; - -/** - * Simple test class with one method returning a String - * - * @author Andy Clement - */ -public class Fruity003 { - public String getFruit() { - return "banana"; - } +package data; + +/** + * Simple test class with one method returning a String + * + * @author Andy Clement + */ +public class Fruity003 { + public String getFruit() { + return "banana"; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorld.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorld.java similarity index 96% rename from org.springsource.loaded.testdata/src/data/HelloWorld.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorld.java index 892c232..e16bddf 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorld.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorld.java @@ -1,27 +1,27 @@ -package data; - -public class HelloWorld { - public void greet() { - System.out.println("Greet from HelloWorld"); - } - - public String getValue() { - return "message from HelloWorld"; - } - - public String getValueWithParams(String a, String b) { - return "message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithParams(String a, String b) { - return "static message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { - return "message with inserts " + a + " and " + i + " and " + ch; - } - - public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { - return "message with inserts " + l + " and " + a + " and " + d + " and " + b; - } +package data; + +public class HelloWorld { + public void greet() { + System.out.println("Greet from HelloWorld"); + } + + public String getValue() { + return "message from HelloWorld"; + } + + public String getValueWithParams(String a, String b) { + return "message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithParams(String a, String b) { + return "static message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { + return "message with inserts " + a + " and " + i + " and " + ch; + } + + public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { + return "message with inserts " + l + " and " + a + " and " + d + " and " + b; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorld002.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorld002.java similarity index 96% rename from org.springsource.loaded.testdata/src/data/HelloWorld002.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorld002.java index 38800e6..64cc947 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorld002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorld002.java @@ -1,28 +1,28 @@ -package data; - -public class HelloWorld002 { - public void greet() { - System.out.println("Greet from HelloWorld 2"); - } - - public String getValue() { - return "message from HelloWorld002"; - } - - public String getValueWithParams(String a, String b) { - return "message with inserts " + b + " and " + a; - } - - public static String getStaticValueWithParams(String a, String b) { - return "static message with inserts " + b + " and " + a; - } - - public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { - return "message with inserts " + ch + " and " + i + " and " + a; - } - - public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { - return "message with inserts " + b + " and " + d + " and " + a + " and " + l; - } - +package data; + +public class HelloWorld002 { + public void greet() { + System.out.println("Greet from HelloWorld 2"); + } + + public String getValue() { + return "message from HelloWorld002"; + } + + public String getValueWithParams(String a, String b) { + return "message with inserts " + b + " and " + a; + } + + public static String getStaticValueWithParams(String a, String b) { + return "static message with inserts " + b + " and " + a; + } + + public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { + return "message with inserts " + ch + " and " + i + " and " + a; + } + + public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { + return "message with inserts " + b + " and " + d + " and " + a + " and " + l; + } + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldClinit.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit.java similarity index 96% rename from org.springsource.loaded.testdata/src/data/HelloWorldClinit.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit.java index 4978ecd..b6d6415 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorldClinit.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit.java @@ -1,35 +1,35 @@ -package data; - -public class HelloWorldClinit { - public void greet() { - System.out.println("Greet from HelloWorldClinit"); - } - - static { - int i = 1; - int j = 2; - for (int k = 0; k < 5; k++) { - i += j; - } - } - - public String getValue() { - return "message from HelloWorld"; - } - - public String getValueWithParams(String a, String b) { - return "message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithParams(String a, String b) { - return "message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { - return "message with inserts " + a + " and " + i + " and " + ch; - } - - public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { - return "message with inserts " + l + " and " + a + " and " + d + " and " + b; - } +package data; + +public class HelloWorldClinit { + public void greet() { + System.out.println("Greet from HelloWorldClinit"); + } + + static { + int i = 1; + int j = 2; + for (int k = 0; k < 5; k++) { + i += j; + } + } + + public String getValue() { + return "message from HelloWorld"; + } + + public String getValueWithParams(String a, String b) { + return "message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithParams(String a, String b) { + return "message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { + return "message with inserts " + a + " and " + i + " and " + ch; + } + + public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { + return "message with inserts " + l + " and " + a + " and " + d + " and " + b; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldClinit002.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit002.java similarity index 96% rename from org.springsource.loaded.testdata/src/data/HelloWorldClinit002.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit002.java index 22c6f3c..374316b 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorldClinit002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldClinit002.java @@ -1,35 +1,35 @@ -package data; - -public class HelloWorldClinit002 { - public void greet() { - System.out.println("Greet from HelloWorldClinit 2"); - } - - static { - int i = 1; - int j = 2; - for (int k = 0; k < 5; k++) { - i += j; - } - } - - public String getValue() { - return "message from HelloWorld"; - } - - public String getValueWithParams(String a, String b) { - return "message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithParams(String a, String b) { - return "message with inserts " + a + " and " + b; - } - - public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { - return "message with inserts " + a + " and " + i + " and " + ch; - } - - public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { - return "message with inserts " + l + " and " + a + " and " + d + " and " + b; - } +package data; + +public class HelloWorldClinit002 { + public void greet() { + System.out.println("Greet from HelloWorldClinit 2"); + } + + static { + int i = 1; + int j = 2; + for (int k = 0; k < 5; k++) { + i += j; + } + } + + public String getValue() { + return "message from HelloWorld"; + } + + public String getValueWithParams(String a, String b) { + return "message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithParams(String a, String b) { + return "message with inserts " + a + " and " + b; + } + + public static String getStaticValueWithPrimitiveParams(String a, int i, char ch) { + return "message with inserts " + a + " and " + i + " and " + ch; + } + + public static String getStaticValueWithPrimitiveDSParams(long l, String a, double d, boolean b) { + return "message with inserts " + l + " and " + a + " and " + d + " and " + b; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldFields.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/HelloWorldFields.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields.java diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldFields002.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields002.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/HelloWorldFields002.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldFields002.java diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldPrimitive.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/HelloWorldPrimitive.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive.java index 70c8624..54fa465 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorldPrimitive.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive.java @@ -1,49 +1,49 @@ -package data; - -public class HelloWorldPrimitive { - - public int getValue() { - return 42; - } - - public int getValueWithParams(String a, String b) { - return Integer.valueOf(a) + Integer.valueOf(b); - } - - public float getValueFloat() { - return 3.0f; - } - - public boolean getValueBoolean() { - return true; - } - - public short getValueShort() { - return 3; - } - - public long getValueLong() { - return 3L; - } - - public double getValueDouble() { - return 3.0d; - } - - public char getValueChar() { - return 'c'; - } - - public byte getValueByte() { - return 3; - } - - public int[] getArrayInt() { - return new int[] { 3 }; - } - - public String[] getArrayString() { - return new String[] { "ABC" }; - } - +package data; + +public class HelloWorldPrimitive { + + public int getValue() { + return 42; + } + + public int getValueWithParams(String a, String b) { + return Integer.valueOf(a) + Integer.valueOf(b); + } + + public float getValueFloat() { + return 3.0f; + } + + public boolean getValueBoolean() { + return true; + } + + public short getValueShort() { + return 3; + } + + public long getValueLong() { + return 3L; + } + + public double getValueDouble() { + return 3.0d; + } + + public char getValueChar() { + return 'c'; + } + + public byte getValueByte() { + return 3; + } + + public int[] getArrayInt() { + return new int[] { 3 }; + } + + public String[] getArrayString() { + return new String[] { "ABC" }; + } + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldPrimitive002.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive002.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/HelloWorldPrimitive002.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive002.java index 7d75037..741e0f7 100644 --- a/org.springsource.loaded.testdata/src/data/HelloWorldPrimitive002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldPrimitive002.java @@ -1,48 +1,48 @@ -package data; - -public class HelloWorldPrimitive002 { - - public int getValue() { - return 37; - } - - public boolean getValueBoolean() { - return false; - } - - public int getValueWithParams(String a, String b) { - return Integer.valueOf(a) + Integer.valueOf(b); - } - - public short getValueShort() { - return 6; - } - - public float getValueFloat() { - return 6.0f; - } - - public double getValueDouble() { - return 6.0d; - } - - public long getValueLong() { - return 6L; - } - - public byte getValueByte() { - return 6; - } - - public char getValueChar() { - return 'f'; - } - - public int[] getArrayInt() { - return new int[] { 5 }; - } - - public String[] getArrayString() { - return new String[] { "DEF" }; - } +package data; + +public class HelloWorldPrimitive002 { + + public int getValue() { + return 37; + } + + public boolean getValueBoolean() { + return false; + } + + public int getValueWithParams(String a, String b) { + return Integer.valueOf(a) + Integer.valueOf(b); + } + + public short getValueShort() { + return 6; + } + + public float getValueFloat() { + return 6.0f; + } + + public double getValueDouble() { + return 6.0d; + } + + public long getValueLong() { + return 6L; + } + + public byte getValueByte() { + return 6; + } + + public char getValueChar() { + return 'f'; + } + + public int[] getArrayInt() { + return new int[] { 5 }; + } + + public String[] getArrayString() { + return new String[] { "DEF" }; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldStaticFields.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/HelloWorldStaticFields.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields.java diff --git a/org.springsource.loaded.testdata/src/data/HelloWorldStaticFields002.java b/org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields002.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/HelloWorldStaticFields002.java rename to org.springsource.loaded.testdata/src/main/java/data/HelloWorldStaticFields002.java diff --git a/org.springsource.loaded.testdata/src/data/Kiwi.java b/org.springsource.loaded.testdata/src/main/java/data/Kiwi.java similarity index 91% rename from org.springsource.loaded.testdata/src/data/Kiwi.java rename to org.springsource.loaded.testdata/src/main/java/data/Kiwi.java index 87081ef..82a7f71 100644 --- a/org.springsource.loaded.testdata/src/data/Kiwi.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Kiwi.java @@ -1,10 +1,10 @@ -package data; - -public class Kiwi { - - Plum plum = new Plum(); - - public void run() { - plum.run(); - } -} +package data; + +public class Kiwi { + + Plum plum = new Plum(); + + public void run() { + plum.run(); + } +} diff --git a/org.springsource.loaded.testdata/src/data/MiddleType.java b/org.springsource.loaded.testdata/src/main/java/data/MiddleType.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/MiddleType.java rename to org.springsource.loaded.testdata/src/main/java/data/MiddleType.java diff --git a/org.springsource.loaded.testdata/src/data/Orange.java b/org.springsource.loaded.testdata/src/main/java/data/Orange.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/Orange.java rename to org.springsource.loaded.testdata/src/main/java/data/Orange.java index a7b3e0c..9c2f18c 100644 --- a/org.springsource.loaded.testdata/src/data/Orange.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Orange.java @@ -1,65 +1,65 @@ -package data; - -public class Orange { - - Apple apple = new Apple(); - - public void one() { - apple.run(); // simple case, no parameters and void return - } - - public void oneWithParam(String string) { - apple.runWithParam(string); - } - - public String oneWithReturn() { - return apple.runWithReturn(); - } - - public int accessFieldOnApple() { - int i = apple.intField; - return i; - } - - public void setFieldOnApple() { - apple.intField = 35; - } - - @SuppressWarnings("static-access") - public int getStaticFieldOnApple() { - return apple.staticIntField; - } - - @SuppressWarnings("static-access") - public void setStaticFieldOnApple() { - apple.staticIntField = 35; - } - - // public String callApple1(String a, Integer b, String c, Integer d) { - // return apple.run(a, b, c, d); - // } - - // public void oneCodeAfter() { - // apple.run(); // simple case, no parameters and void return - // int j = 3; - // System.out.println(j); - // } - // - // public void oneCodeBefore() { - // int k = 3; - // System.out.println(k); - // apple.run(); // simple case, no parameters and void return - // } - // - // public void oneCodeBeforeAndAfter() { - // int k = 3; - // System.out.println(k); - // apple.run(); // simple case, no parameters and void return - // int j = 3; - // System.out.println(j); - // } - - // public String oneWithReturn() { - // return apple.runWithReturn(); - // } -} +package data; + +public class Orange { + + Apple apple = new Apple(); + + public void one() { + apple.run(); // simple case, no parameters and void return + } + + public void oneWithParam(String string) { + apple.runWithParam(string); + } + + public String oneWithReturn() { + return apple.runWithReturn(); + } + + public int accessFieldOnApple() { + int i = apple.intField; + return i; + } + + public void setFieldOnApple() { + apple.intField = 35; + } + + @SuppressWarnings("static-access") + public int getStaticFieldOnApple() { + return apple.staticIntField; + } + + @SuppressWarnings("static-access") + public void setStaticFieldOnApple() { + apple.staticIntField = 35; + } + + // public String callApple1(String a, Integer b, String c, Integer d) { + // return apple.run(a, b, c, d); + // } + + // public void oneCodeAfter() { + // apple.run(); // simple case, no parameters and void return + // int j = 3; + // System.out.println(j); + // } + // + // public void oneCodeBefore() { + // int k = 3; + // System.out.println(k); + // apple.run(); // simple case, no parameters and void return + // } + // + // public void oneCodeBeforeAndAfter() { + // int k = 3; + // System.out.println(k); + // apple.run(); // simple case, no parameters and void return + // int j = 3; + // System.out.println(j); + // } + + // public String oneWithReturn() { + // return apple.runWithReturn(); + // } +} diff --git a/org.springsource.loaded.testdata/src/data/Orange002.java b/org.springsource.loaded.testdata/src/main/java/data/Orange002.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/Orange002.java rename to org.springsource.loaded.testdata/src/main/java/data/Orange002.java index 77d46a7..cfbcf43 100644 --- a/org.springsource.loaded.testdata/src/data/Orange002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Orange002.java @@ -1,86 +1,86 @@ -package data; - -public class Orange002 { - - Apple002 apple = new Apple002(); - - public String callApple1(String a, Integer b, String c, Integer d) { - return apple.run(a, b, c, d); - } - - public String callApple2(int i) { - return apple.run2(i); - } - - public Integer callApple3(int i) { - return apple.run3(i); - } - - public String callApple3x(String s, int i, double d, String t, int[] is) { - return apple.run(s, i, d, t, is); - } - - public static Integer callApple4(int i) { - return Apple002.run4(i); - } - - public Float callAppleRetFloat(float i) { - return apple.runGetFloat(i); - } - - public Boolean callAppleRetBoolean(boolean i) { - return apple.runGetBoolean(i); - } - - public Short callAppleRetShort(short i) { - return apple.runGetShort(i); - } - - public Long callAppleRetLong(long i) { - return apple.runGetLong(i); - } - - public Double callAppleRetDouble(double i) { - return apple.runGetDouble(i); - } - - public Character callAppleRetChar(char i) { - return apple.runGetChar(i); - } - - public Byte callAppleRetByte(byte b) { - return apple.runGetByte(b); - } - - public int[] callAppleRetArrayInt(int[] b) { - return apple.runGetArrayInt(b); - } - - public String[] callAppleRetArrayString(String[] b) { - return apple.runGetArrayString(b); - } - - // public void oneCodeAfter() { - // apple.run(); // simple case, no parameters and void return - // int j = 3; - // System.out.println(j); - // } - // - // public void oneCodeBefore() { - // int k = 3; - // System.out.println(k); - // apple.run(); // simple case, no parameters and void return - // } - // - // public void oneCodeBeforeAndAfter() { - // int k = 3; - // System.out.println(k); - // apple.run(); // simple case, no parameters and void return - // int j = 3; - // System.out.println(j); - // } - - // public String oneWithReturn() { - // return apple.runWithReturn(); - // } -} +package data; + +public class Orange002 { + + Apple002 apple = new Apple002(); + + public String callApple1(String a, Integer b, String c, Integer d) { + return apple.run(a, b, c, d); + } + + public String callApple2(int i) { + return apple.run2(i); + } + + public Integer callApple3(int i) { + return apple.run3(i); + } + + public String callApple3x(String s, int i, double d, String t, int[] is) { + return apple.run(s, i, d, t, is); + } + + public static Integer callApple4(int i) { + return Apple002.run4(i); + } + + public Float callAppleRetFloat(float i) { + return apple.runGetFloat(i); + } + + public Boolean callAppleRetBoolean(boolean i) { + return apple.runGetBoolean(i); + } + + public Short callAppleRetShort(short i) { + return apple.runGetShort(i); + } + + public Long callAppleRetLong(long i) { + return apple.runGetLong(i); + } + + public Double callAppleRetDouble(double i) { + return apple.runGetDouble(i); + } + + public Character callAppleRetChar(char i) { + return apple.runGetChar(i); + } + + public Byte callAppleRetByte(byte b) { + return apple.runGetByte(b); + } + + public int[] callAppleRetArrayInt(int[] b) { + return apple.runGetArrayInt(b); + } + + public String[] callAppleRetArrayString(String[] b) { + return apple.runGetArrayString(b); + } + + // public void oneCodeAfter() { + // apple.run(); // simple case, no parameters and void return + // int j = 3; + // System.out.println(j); + // } + // + // public void oneCodeBefore() { + // int k = 3; + // System.out.println(k); + // apple.run(); // simple case, no parameters and void return + // } + // + // public void oneCodeBeforeAndAfter() { + // int k = 3; + // System.out.println(k); + // apple.run(); // simple case, no parameters and void return + // int j = 3; + // System.out.println(j); + // } + + // public String oneWithReturn() { + // return apple.runWithReturn(); + // } +} diff --git a/org.springsource.loaded.testdata/src/data/Pear.java b/org.springsource.loaded.testdata/src/main/java/data/Pear.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/Pear.java rename to org.springsource.loaded.testdata/src/main/java/data/Pear.java index 8b5a14f..b6f8e98 100644 --- a/org.springsource.loaded.testdata/src/data/Pear.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Pear.java @@ -1,26 +1,26 @@ -package data; - -public class Pear { - - public int intField; - public static int staticIntField; - public int[] intArray = new int[] { 4, 3, 2, 1 }; - public static int[] staticIntArray = new int[] { 44, 33, 22, 11 }; - - public void run() { - System.out.println("Apple.run() is running "); - } - - public int[] getIntArray() { - return intArray; - } - - public String runWithReturn() { - return "alphabeti spaghetti"; - } - - public void runWithParam(String string) { - System.out.println("Apple.run(" + string + ") is running "); - } - -} +package data; + +public class Pear { + + public int intField; + public static int staticIntField; + public int[] intArray = new int[] { 4, 3, 2, 1 }; + public static int[] staticIntArray = new int[] { 44, 33, 22, 11 }; + + public void run() { + System.out.println("Apple.run() is running "); + } + + public int[] getIntArray() { + return intArray; + } + + public String runWithReturn() { + return "alphabeti spaghetti"; + } + + public void runWithParam(String string) { + System.out.println("Apple.run(" + string + ") is running "); + } + +} diff --git a/org.springsource.loaded.testdata/src/data/Plum.java b/org.springsource.loaded.testdata/src/main/java/data/Plum.java similarity index 87% rename from org.springsource.loaded.testdata/src/data/Plum.java rename to org.springsource.loaded.testdata/src/main/java/data/Plum.java index 2773eca..b6f7646 100644 --- a/org.springsource.loaded.testdata/src/data/Plum.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Plum.java @@ -1,9 +1,9 @@ -package data; - -public class Plum { - - public void run() { - - } - -} +package data; + +public class Plum { + + public void run() { + + } + +} diff --git a/org.springsource.loaded.testdata/src/data/Plum002.java b/org.springsource.loaded.testdata/src/main/java/data/Plum002.java similarity index 90% rename from org.springsource.loaded.testdata/src/data/Plum002.java rename to org.springsource.loaded.testdata/src/main/java/data/Plum002.java index 9dba391..90c2c37 100644 --- a/org.springsource.loaded.testdata/src/data/Plum002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Plum002.java @@ -1,13 +1,13 @@ -package data; - -public class Plum002 { - - public void run() { - callPrivate(); - } - - private void callPrivate() { - - } - -} +package data; + +public class Plum002 { + + public void run() { + callPrivate(); + } + + private void callPrivate() { + + } + +} diff --git a/org.springsource.loaded.testdata/src/data/Reflector.java b/org.springsource.loaded.testdata/src/main/java/data/Reflector.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/Reflector.java rename to org.springsource.loaded.testdata/src/main/java/data/Reflector.java index a5b5fe2..0a14945 100644 --- a/org.springsource.loaded.testdata/src/data/Reflector.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Reflector.java @@ -1,9 +1,9 @@ -package data; - -public class Reflector { - - public void runOne() { - AnnotatedClazz.class.getAnnotation(Anno.class); - } - -} +package data; + +public class Reflector { + + public void runOne() { + AnnotatedClazz.class.getAnnotation(Anno.class); + } + +} diff --git a/org.springsource.loaded.testdata/src/data/Runner.java b/org.springsource.loaded.testdata/src/main/java/data/Runner.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/Runner.java rename to org.springsource.loaded.testdata/src/main/java/data/Runner.java index b1da0d7..d768155 100644 --- a/org.springsource.loaded.testdata/src/data/Runner.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Runner.java @@ -1,33 +1,33 @@ -package data; - -/** - * Long running program for checking watching and class replacement. - * - * @author Andy Clement - */ -public class Runner { - - public static void main(String[] args) { - new Runner().run(); - } - - static Orange orange = new Orange(); - - /** - * Every 10 seconds, call one() - */ - public void run() { - while (true) { - try { - Thread.sleep(10000); - } catch (Exception e) { - } - try { - orange.one(); - } catch (Throwable t) { - t.printStackTrace(); - } - } - } - -} +package data; + +/** + * Long running program for checking watching and class replacement. + * + * @author Andy Clement + */ +public class Runner { + + public static void main(String[] args) { + new Runner().run(); + } + + static Orange orange = new Orange(); + + /** + * Every 10 seconds, call one() + */ + public void run() { + while (true) { + try { + Thread.sleep(10000); + } catch (Exception e) { + } + try { + orange.one(); + } catch (Throwable t) { + t.printStackTrace(); + } + } + } + +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioA.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA.java similarity index 92% rename from org.springsource.loaded.testdata/src/data/ScenarioA.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioA.java index 80f8a24..980f893 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioA.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA.java @@ -1,12 +1,12 @@ -package data; - -public class ScenarioA { - - public String foo() { - return "from ScenarioA"; - } - - public String getName() { - return null; - } -} +package data; + +public class ScenarioA { + + public String foo() { + return "from ScenarioA"; + } + + public String getName() { + return null; + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioA002.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA002.java similarity index 92% rename from org.springsource.loaded.testdata/src/data/ScenarioA002.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioA002.java index 1d51a85..8411e07 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioA002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA002.java @@ -1,8 +1,8 @@ -package data; - -public class ScenarioA002 { - - public String foo() { - return "from ScenarioA 002"; - } -} +package data; + +public class ScenarioA002 { + + public String foo() { + return "from ScenarioA 002"; + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioA003.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA003.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/ScenarioA003.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioA003.java index c31a7d0..46d3188 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioA003.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA003.java @@ -1,12 +1,12 @@ -package data; - -public class ScenarioA003 { - - public String foo() { - return "from " + getValue(); - } - - public String getValue() { - return "ScenarioA 003"; - } -} +package data; + +public class ScenarioA003 { + + public String foo() { + return "from " + getValue(); + } + + public String getValue() { + return "ScenarioA 003"; + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioA004.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA004.java similarity index 92% rename from org.springsource.loaded.testdata/src/data/ScenarioA004.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioA004.java index eb299dd..1666196 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioA004.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioA004.java @@ -1,21 +1,21 @@ -package data; - -public class ScenarioA004 { - - String name; - - public String foo() { - return "from " + getValue(); - } - - public String getValue() { - if (name == null) { - name = "004"; - } - return "ScenarioA " + name; - } - - public String getName() { - return name; - } -} +package data; + +public class ScenarioA004 { + + String name; + + public String foo() { + return "from " + getValue(); + } + + public String getValue() { + if (name == null) { + name = "004"; + } + return "ScenarioA " + name; + } + + public String getName() { + return name; + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioB.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/ScenarioB.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioB.java index 27bab59..3f4adb1 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioB.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB.java @@ -1,28 +1,28 @@ -package data; - -import java.lang.annotation.Annotation; - -public class ScenarioB { - - public static String methodAccessor() { - try { - ScenarioB.class.getDeclaredMethod("foo"); - return "method found"; - } catch (Exception e) { - return "method not found"; - } - } - - public static String annoAccessor() { - try { - Annotation[] annos = ScenarioB002.class.getDeclaredMethod("foo").getDeclaredAnnotations(); - if (annos == null || annos.length == 0) { - return "no annotations"; - } else { - return "found " + (annos[0]); - } - } catch (Exception e) { - return "no annotations"; - } - } -} +package data; + +import java.lang.annotation.Annotation; + +public class ScenarioB { + + public static String methodAccessor() { + try { + ScenarioB.class.getDeclaredMethod("foo"); + return "method found"; + } catch (Exception e) { + return "method not found"; + } + } + + public static String annoAccessor() { + try { + Annotation[] annos = ScenarioB002.class.getDeclaredMethod("foo").getDeclaredAnnotations(); + if (annos == null || annos.length == 0) { + return "no annotations"; + } else { + return "found " + (annos[0]); + } + } catch (Exception e) { + return "no annotations"; + } + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioB002.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB002.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/ScenarioB002.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioB002.java index 2be10e5..3cb1e38 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioB002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB002.java @@ -1,32 +1,32 @@ -package data; - -import java.lang.annotation.Annotation; - -public class ScenarioB002 { - - public static String methodAccessor() { - try { - ScenarioB002.class.getDeclaredMethod("foo"); - return "method found"; - } catch (Exception e) { - return "method not found"; - } - } - - public static String annoAccessor() { - try { - Annotation[] annos = ScenarioB002.class.getDeclaredMethod("foo").getDeclaredAnnotations(); - if (annos == null || annos.length == 0) { - return "no annotations"; - } else { - return "found " + (annos[0]); - } - } catch (Exception e) { - return "no annotations"; - } - } - - public void foo() { - - } -} +package data; + +import java.lang.annotation.Annotation; + +public class ScenarioB002 { + + public static String methodAccessor() { + try { + ScenarioB002.class.getDeclaredMethod("foo"); + return "method found"; + } catch (Exception e) { + return "method not found"; + } + } + + public static String annoAccessor() { + try { + Annotation[] annos = ScenarioB002.class.getDeclaredMethod("foo").getDeclaredAnnotations(); + if (annos == null || annos.length == 0) { + return "no annotations"; + } else { + return "found " + (annos[0]); + } + } catch (Exception e) { + return "no annotations"; + } + } + + public void foo() { + + } +} diff --git a/org.springsource.loaded.testdata/src/data/ScenarioB003.java b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB003.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/ScenarioB003.java rename to org.springsource.loaded.testdata/src/main/java/data/ScenarioB003.java index 1a3ad9b..8f6a8b8 100644 --- a/org.springsource.loaded.testdata/src/data/ScenarioB003.java +++ b/org.springsource.loaded.testdata/src/main/java/data/ScenarioB003.java @@ -1,33 +1,33 @@ -package data; - -import java.lang.annotation.Annotation; - -public class ScenarioB003 { - - public static String methodAccessor() { - try { - ScenarioB003.class.getDeclaredMethod("foo"); - return "method found"; - } catch (Exception e) { - return "method not found"; - } - } - - public static String annoAccessor() { - try { - Annotation[] annos = ScenarioB003.class.getDeclaredMethod("foo").getDeclaredAnnotations(); - if (annos == null || annos.length == 0) { - return "no annotations"; - } else { - return "found " + (annos[0]); - } - } catch (Exception e) { - return "no annotations"; - } - } - - @Wiggle - public void foo() { - - } -} +package data; + +import java.lang.annotation.Annotation; + +public class ScenarioB003 { + + public static String methodAccessor() { + try { + ScenarioB003.class.getDeclaredMethod("foo"); + return "method found"; + } catch (Exception e) { + return "method not found"; + } + } + + public static String annoAccessor() { + try { + Annotation[] annos = ScenarioB003.class.getDeclaredMethod("foo").getDeclaredAnnotations(); + if (annos == null || annos.length == 0) { + return "no annotations"; + } else { + return "found " + (annos[0]); + } + } catch (Exception e) { + return "no annotations"; + } + } + + @Wiggle + public void foo() { + + } +} diff --git a/org.springsource.loaded.testdata/src/data/Simple.java b/org.springsource.loaded.testdata/src/main/java/data/Simple.java similarity index 94% rename from org.springsource.loaded.testdata/src/data/Simple.java rename to org.springsource.loaded.testdata/src/main/java/data/Simple.java index 94cbcaa..387345c 100644 --- a/org.springsource.loaded.testdata/src/data/Simple.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Simple.java @@ -1,26 +1,26 @@ -package data; - -/** - * Simple class that runs a method. Can we update the method without restarting the JVM. - */ -public class Simple { - - public static void main(String[] argv) { - Simple s = new Simple(); - s.run(); - } - - public void run() { - System.out.println("Hello World3"); - } - - public static void runStatic() { - System.out.println("Hello World from static2"); - } - - public void newmethod() { - System.out.println(); - } - - -} +package data; + +/** + * Simple class that runs a method. Can we update the method without restarting the JVM. + */ +public class Simple { + + public static void main(String[] argv) { + Simple s = new Simple(); + s.run(); + } + + public void run() { + System.out.println("Hello World3"); + } + + public static void runStatic() { + System.out.println("Hello World from static2"); + } + + public void newmethod() { + System.out.println(); + } + + +} diff --git a/org.springsource.loaded.testdata/src/data/SimpleClass.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClass.java similarity index 91% rename from org.springsource.loaded.testdata/src/data/SimpleClass.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClass.java index f9b2207..cfe1689 100644 --- a/org.springsource.loaded.testdata/src/data/SimpleClass.java +++ b/org.springsource.loaded.testdata/src/main/java/data/SimpleClass.java @@ -1,7 +1,7 @@ -package data; - -class SimpleClass { - public void foo() { - - } +package data; + +class SimpleClass { + public void foo() { + + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/SimpleClass002.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SimpleClass002.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClass002.java diff --git a/org.springsource.loaded.testdata/src/data/SimpleClassCaller.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassCaller.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SimpleClassCaller.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClassCaller.java diff --git a/org.springsource.loaded.testdata/src/data/SimpleClassFour.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/SimpleClassFour.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour.java index 93923e2..f50c404 100644 --- a/org.springsource.loaded.testdata/src/data/SimpleClassFour.java +++ b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour.java @@ -1,35 +1,35 @@ -package data; - -class SimpleClassFour { - { - System.out.println("clinit!"); - } - - public int boo; - - public static String s; - - public SimpleClassFour(int i) { - } - - public SimpleClassFour(String d) { - } - - void boo() { - } - - @SuppressWarnings("unused") - private static void foo() { - } - - public String goo(int i, double d, String p) { - return p; - } - - public static int hoo(long l) { - return new Long(l).intValue(); - } - - public static void woo() throws RuntimeException, IllegalStateException { - } +package data; + +class SimpleClassFour { + { + System.out.println("clinit!"); + } + + public int boo; + + public static String s; + + public SimpleClassFour(int i) { + } + + public SimpleClassFour(String d) { + } + + void boo() { + } + + @SuppressWarnings("unused") + private static void foo() { + } + + public String goo(int i, double d, String p) { + return p; + } + + public static int hoo(long l) { + return new Long(l).intValue(); + } + + public static void woo() throws RuntimeException, IllegalStateException { + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/SimpleClassFour002.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour002.java similarity index 93% rename from org.springsource.loaded.testdata/src/data/SimpleClassFour002.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour002.java index 049e081..c2993b9 100644 --- a/org.springsource.loaded.testdata/src/data/SimpleClassFour002.java +++ b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassFour002.java @@ -1,43 +1,43 @@ -package data; - -class SimpleClassFour002 { - { - System.out.println("clinit!"); - } - - public int boo; - - public static String s; - - public SimpleClassFour002(int i) { - } - - public SimpleClassFour002(String d) { - } - - public static Double extraTwo(int i) { - return 2.0d; - } - - void boo() { - } - - @SuppressWarnings("unused") - private static void foo() { - } - - public String goo(int i, double d, String p) { - return p; - } - - public static int hoo(long l) { - return new Long(l).intValue(); - } - - public static void woo() throws RuntimeException, IllegalStateException { - } - - public void extraOne(String s) { - - } +package data; + +class SimpleClassFour002 { + { + System.out.println("clinit!"); + } + + public int boo; + + public static String s; + + public SimpleClassFour002(int i) { + } + + public SimpleClassFour002(String d) { + } + + public static Double extraTwo(int i) { + return 2.0d; + } + + void boo() { + } + + @SuppressWarnings("unused") + private static void foo() { + } + + public String goo(int i, double d, String p) { + return p; + } + + public static int hoo(long l) { + return new Long(l).intValue(); + } + + public static void woo() throws RuntimeException, IllegalStateException { + } + + public void extraOne(String s) { + + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/SimpleClassThree.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassThree.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/SimpleClassThree.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClassThree.java index 81a2434..fed95be 100644 --- a/org.springsource.loaded.testdata/src/data/SimpleClassThree.java +++ b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassThree.java @@ -1,12 +1,12 @@ -package data; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("rawtypes") -class SimpleClassThree { - public static String foo(List list, Map m) throws IOException { - return null; - } +package data; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +@SuppressWarnings("rawtypes") +class SimpleClassThree { + public static String foo(List list, Map m) throws IOException { + return null; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/SimpleClassTwo.java b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassTwo.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/SimpleClassTwo.java rename to org.springsource.loaded.testdata/src/main/java/data/SimpleClassTwo.java index 2e058b2..068e703 100644 --- a/org.springsource.loaded.testdata/src/data/SimpleClassTwo.java +++ b/org.springsource.loaded.testdata/src/main/java/data/SimpleClassTwo.java @@ -1,12 +1,12 @@ -package data; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -@SuppressWarnings("rawtypes") -class SimpleClassTwo { - public String foo(List list, Map m) throws IOException { - return null; - } +package data; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +@SuppressWarnings("rawtypes") +class SimpleClassTwo { + public String foo(List list, Map m) throws IOException { + return null; + } } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/data/SomeConstructors.java b/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SomeConstructors.java rename to org.springsource.loaded.testdata/src/main/java/data/SomeConstructors.java diff --git a/org.springsource.loaded.testdata/src/data/SomeConstructors002.java b/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors002.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SomeConstructors002.java rename to org.springsource.loaded.testdata/src/main/java/data/SomeConstructors002.java diff --git a/org.springsource.loaded.testdata/src/data/SomeConstructors2.java b/org.springsource.loaded.testdata/src/main/java/data/SomeConstructors2.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SomeConstructors2.java rename to org.springsource.loaded.testdata/src/main/java/data/SomeConstructors2.java diff --git a/org.springsource.loaded.testdata/src/data/SomeFields.java b/org.springsource.loaded.testdata/src/main/java/data/SomeFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/SomeFields.java rename to org.springsource.loaded.testdata/src/main/java/data/SomeFields.java diff --git a/org.springsource.loaded.testdata/src/data/StaticFieldsB.java b/org.springsource.loaded.testdata/src/main/java/data/StaticFieldsB.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/StaticFieldsB.java rename to org.springsource.loaded.testdata/src/main/java/data/StaticFieldsB.java diff --git a/org.springsource.loaded.testdata/src/data/TopType.java b/org.springsource.loaded.testdata/src/main/java/data/TopType.java similarity index 100% rename from org.springsource.loaded.testdata/src/data/TopType.java rename to org.springsource.loaded.testdata/src/main/java/data/TopType.java diff --git a/org.springsource.loaded.testdata/src/data/Wiggle.java b/org.springsource.loaded.testdata/src/main/java/data/Wiggle.java similarity index 95% rename from org.springsource.loaded.testdata/src/data/Wiggle.java rename to org.springsource.loaded.testdata/src/main/java/data/Wiggle.java index e080b31..895523a 100644 --- a/org.springsource.loaded.testdata/src/data/Wiggle.java +++ b/org.springsource.loaded.testdata/src/main/java/data/Wiggle.java @@ -1,9 +1,9 @@ -package data; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface Wiggle { - String value() default "default"; -} +package data; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Wiggle { + String value() default "default"; +} diff --git a/org.springsource.loaded.testdata/src/dd/Middle.java b/org.springsource.loaded.testdata/src/main/java/dd/Middle.java similarity index 100% rename from org.springsource.loaded.testdata/src/dd/Middle.java rename to org.springsource.loaded.testdata/src/main/java/dd/Middle.java diff --git a/org.springsource.loaded.testdata/src/dd/Top.java b/org.springsource.loaded.testdata/src/main/java/dd/Top.java similarity index 100% rename from org.springsource.loaded.testdata/src/dd/Top.java rename to org.springsource.loaded.testdata/src/main/java/dd/Top.java diff --git a/org.springsource.loaded.testdata/src/differs/Annot.java b/org.springsource.loaded.testdata/src/main/java/differs/Annot.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/Annot.java rename to org.springsource.loaded.testdata/src/main/java/differs/Annot.java diff --git a/org.springsource.loaded.testdata/src/differs/Annot2.java b/org.springsource.loaded.testdata/src/main/java/differs/Annot2.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/Annot2.java rename to org.springsource.loaded.testdata/src/main/java/differs/Annot2.java diff --git a/org.springsource.loaded.testdata/src/differs/AnnotFields.java b/org.springsource.loaded.testdata/src/main/java/differs/AnnotFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/AnnotFields.java rename to org.springsource.loaded.testdata/src/main/java/differs/AnnotFields.java diff --git a/org.springsource.loaded.testdata/src/differs/AnnotFields2.java b/org.springsource.loaded.testdata/src/main/java/differs/AnnotFields2.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/AnnotFields2.java rename to org.springsource.loaded.testdata/src/main/java/differs/AnnotFields2.java diff --git a/org.springsource.loaded.testdata/src/differs/AnnotFieldsTwo.java b/org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/AnnotFieldsTwo.java rename to org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo.java diff --git a/org.springsource.loaded.testdata/src/differs/AnnotFieldsTwo2.java b/org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo2.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/AnnotFieldsTwo2.java rename to org.springsource.loaded.testdata/src/main/java/differs/AnnotFieldsTwo2.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffOne.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffOne.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffOne.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffOneX.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffOneX.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffOneX.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffOneX.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffOneY.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffOneY.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffOneY.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffOneY.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffOneZ.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffOneZ.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffOneZ.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffOneZ.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffThree.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffThree.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffThree.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffThree.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffThreeX.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffThreeX.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffThreeX.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffThreeX.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffThreeY.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffThreeY.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffThreeY.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffThreeY.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffTwo.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffTwo.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffTwo.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffTwo.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffTwoX.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoX.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffTwoX.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffTwoX.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffTwoY.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoY.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffTwoY.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffTwoY.java diff --git a/org.springsource.loaded.testdata/src/differs/DiffTwoZ.java b/org.springsource.loaded.testdata/src/main/java/differs/DiffTwoZ.java similarity index 100% rename from org.springsource.loaded.testdata/src/differs/DiffTwoZ.java rename to org.springsource.loaded.testdata/src/main/java/differs/DiffTwoZ.java diff --git a/org.springsource.loaded.testdata/src/dispatcher/C.java b/org.springsource.loaded.testdata/src/main/java/dispatcher/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/dispatcher/C.java rename to org.springsource.loaded.testdata/src/main/java/dispatcher/C.java diff --git a/org.springsource.loaded.testdata/src/dispatcher/CallC.java b/org.springsource.loaded.testdata/src/main/java/dispatcher/CallC.java similarity index 100% rename from org.springsource.loaded.testdata/src/dispatcher/CallC.java rename to org.springsource.loaded.testdata/src/main/java/dispatcher/CallC.java diff --git a/org.springsource.loaded.testdata/src/dispatcher/Staticmethod.java b/org.springsource.loaded.testdata/src/main/java/dispatcher/Staticmethod.java similarity index 100% rename from org.springsource.loaded.testdata/src/dispatcher/Staticmethod.java rename to org.springsource.loaded.testdata/src/main/java/dispatcher/Staticmethod.java diff --git a/org.springsource.loaded.testdata/src/dispatcher/StaticmethodCaller.java b/org.springsource.loaded.testdata/src/main/java/dispatcher/StaticmethodCaller.java similarity index 100% rename from org.springsource.loaded.testdata/src/dispatcher/StaticmethodCaller.java rename to org.springsource.loaded.testdata/src/main/java/dispatcher/StaticmethodCaller.java diff --git a/org.springsource.loaded.testdata/src/enumtests/Colours.java b/org.springsource.loaded.testdata/src/main/java/enumtests/Colours.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/Colours.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/Colours.java diff --git a/org.springsource.loaded.testdata/src/enumtests/Colours2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/Colours2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/Colours2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/Colours2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursB.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursB.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursB2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursB2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursB3.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB3.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursB3.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursB3.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursC.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursC.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursC2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursC2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursC2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursD.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursD.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursD2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursD2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursD2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursE.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursE.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE.java diff --git a/org.springsource.loaded.testdata/src/enumtests/ColoursE2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/ColoursE2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/ColoursE2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/Intface.java b/org.springsource.loaded.testdata/src/main/java/enumtests/Intface.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/Intface.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/Intface.java diff --git a/org.springsource.loaded.testdata/src/enumtests/Intface3.java b/org.springsource.loaded.testdata/src/main/java/enumtests/Intface3.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/Intface3.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/Intface3.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerA.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerA.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerA.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerA.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerB.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerB.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerB3.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB3.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerB3.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerB3.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerC.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerC.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerC.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerC.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerD.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerD.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerD2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerD2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerD2.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerE.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerE.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE.java diff --git a/org.springsource.loaded.testdata/src/enumtests/RunnerE2.java b/org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE2.java similarity index 100% rename from org.springsource.loaded.testdata/src/enumtests/RunnerE2.java rename to org.springsource.loaded.testdata/src/main/java/enumtests/RunnerE2.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/MyMethodInterceptor.java b/org.springsource.loaded.testdata/src/main/java/example/MyMethodInterceptor.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/MyMethodInterceptor.java rename to org.springsource.loaded.testdata/src/main/java/example/MyMethodInterceptor.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/ProxyBuilder.java b/org.springsource.loaded.testdata/src/main/java/example/ProxyBuilder.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/ProxyBuilder.java rename to org.springsource.loaded.testdata/src/main/java/example/ProxyBuilder.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/ProxyTestcase.java b/org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/ProxyTestcase.java rename to org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/ProxyTestcase2.java b/org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase2.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/ProxyTestcase2.java rename to org.springsource.loaded.testdata/src/main/java/example/ProxyTestcase2.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/Simple.java b/org.springsource.loaded.testdata/src/main/java/example/Simple.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/Simple.java rename to org.springsource.loaded.testdata/src/main/java/example/Simple.java diff --git a/org.springsource.loaded.testdata/cglibsrc/example/Simple2.java b/org.springsource.loaded.testdata/src/main/java/example/Simple2.java similarity index 100% rename from org.springsource.loaded.testdata/cglibsrc/example/Simple2.java rename to org.springsource.loaded.testdata/src/main/java/example/Simple2.java diff --git a/org.springsource.loaded.testdata/src/executor/A.java b/org.springsource.loaded.testdata/src/main/java/executor/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/A.java rename to org.springsource.loaded.testdata/src/main/java/executor/A.java diff --git a/org.springsource.loaded.testdata/src/executor/A2.java b/org.springsource.loaded.testdata/src/main/java/executor/A2.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/A2.java rename to org.springsource.loaded.testdata/src/main/java/executor/A2.java diff --git a/org.springsource.loaded.testdata/src/executor/B.java b/org.springsource.loaded.testdata/src/main/java/executor/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/B.java rename to org.springsource.loaded.testdata/src/main/java/executor/B.java diff --git a/org.springsource.loaded.testdata/src/executor/B2.java b/org.springsource.loaded.testdata/src/main/java/executor/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/B2.java rename to org.springsource.loaded.testdata/src/main/java/executor/B2.java diff --git a/org.springsource.loaded.testdata/src/executor/C.java b/org.springsource.loaded.testdata/src/main/java/executor/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/C.java rename to org.springsource.loaded.testdata/src/main/java/executor/C.java diff --git a/org.springsource.loaded.testdata/src/executor/I.java b/org.springsource.loaded.testdata/src/main/java/executor/I.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/I.java rename to org.springsource.loaded.testdata/src/main/java/executor/I.java diff --git a/org.springsource.loaded.testdata/src/executor/I2.java b/org.springsource.loaded.testdata/src/main/java/executor/I2.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/I2.java rename to org.springsource.loaded.testdata/src/main/java/executor/I2.java diff --git a/org.springsource.loaded.testdata/src/executor/TestOne.java b/org.springsource.loaded.testdata/src/main/java/executor/TestOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/TestOne.java rename to org.springsource.loaded.testdata/src/main/java/executor/TestOne.java diff --git a/org.springsource.loaded.testdata/src/executor/TestOne2.java b/org.springsource.loaded.testdata/src/main/java/executor/TestOne2.java similarity index 100% rename from org.springsource.loaded.testdata/src/executor/TestOne2.java rename to org.springsource.loaded.testdata/src/main/java/executor/TestOne2.java diff --git a/org.springsource.loaded.testdata/src/fields/A.java b/org.springsource.loaded.testdata/src/main/java/fields/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/A.java rename to org.springsource.loaded.testdata/src/main/java/fields/A.java diff --git a/org.springsource.loaded.testdata/src/fields/Aa.java b/org.springsource.loaded.testdata/src/main/java/fields/Aa.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Aa.java rename to org.springsource.loaded.testdata/src/main/java/fields/Aa.java diff --git a/org.springsource.loaded.testdata/src/fields/Add.java b/org.springsource.loaded.testdata/src/main/java/fields/Add.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Add.java rename to org.springsource.loaded.testdata/src/main/java/fields/Add.java diff --git a/org.springsource.loaded.testdata/src/fields/Add002.java b/org.springsource.loaded.testdata/src/main/java/fields/Add002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Add002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Add002.java diff --git a/org.springsource.loaded.testdata/src/fields/AddB.java b/org.springsource.loaded.testdata/src/main/java/fields/AddB.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/AddB.java rename to org.springsource.loaded.testdata/src/main/java/fields/AddB.java diff --git a/org.springsource.loaded.testdata/src/fields/AddB002.java b/org.springsource.loaded.testdata/src/main/java/fields/AddB002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/AddB002.java rename to org.springsource.loaded.testdata/src/main/java/fields/AddB002.java diff --git a/org.springsource.loaded.testdata/src/fields/B.java b/org.springsource.loaded.testdata/src/main/java/fields/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/B.java rename to org.springsource.loaded.testdata/src/main/java/fields/B.java diff --git a/org.springsource.loaded.testdata/src/fields/B2.java b/org.springsource.loaded.testdata/src/main/java/fields/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/B2.java rename to org.springsource.loaded.testdata/src/main/java/fields/B2.java diff --git a/org.springsource.loaded.testdata/src/fields/Ba.java b/org.springsource.loaded.testdata/src/main/java/fields/Ba.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ba.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ba.java diff --git a/org.springsource.loaded.testdata/src/fields/Ba2.java b/org.springsource.loaded.testdata/src/main/java/fields/Ba2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ba2.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ba2.java diff --git a/org.springsource.loaded.testdata/src/fields/C.java b/org.springsource.loaded.testdata/src/main/java/fields/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/C.java rename to org.springsource.loaded.testdata/src/main/java/fields/C.java diff --git a/org.springsource.loaded.testdata/src/fields/Ca.java b/org.springsource.loaded.testdata/src/main/java/fields/Ca.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ca.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ca.java diff --git a/org.springsource.loaded.testdata/src/fields/E.java b/org.springsource.loaded.testdata/src/main/java/fields/E.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/E.java rename to org.springsource.loaded.testdata/src/main/java/fields/E.java diff --git a/org.springsource.loaded.testdata/src/fields/E2.java b/org.springsource.loaded.testdata/src/main/java/fields/E2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/E2.java rename to org.springsource.loaded.testdata/src/main/java/fields/E2.java diff --git a/org.springsource.loaded.testdata/src/fields/Ia.java b/org.springsource.loaded.testdata/src/main/java/fields/Ia.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ia.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ia.java diff --git a/org.springsource.loaded.testdata/src/fields/Ic.java b/org.springsource.loaded.testdata/src/main/java/fields/Ic.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ic.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ic.java diff --git a/org.springsource.loaded.testdata/src/fields/Ja.java b/org.springsource.loaded.testdata/src/main/java/fields/Ja.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ja.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ja.java diff --git a/org.springsource.loaded.testdata/src/fields/Ka.java b/org.springsource.loaded.testdata/src/main/java/fields/Ka.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ka.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ka.java diff --git a/org.springsource.loaded.testdata/src/fields/Ka002.java b/org.springsource.loaded.testdata/src/main/java/fields/Ka002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ka002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ka002.java diff --git a/org.springsource.loaded.testdata/src/fields/NotReloadable.java b/org.springsource.loaded.testdata/src/main/java/fields/NotReloadable.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/NotReloadable.java rename to org.springsource.loaded.testdata/src/main/java/fields/NotReloadable.java diff --git a/org.springsource.loaded.testdata/src/fields/One.java b/org.springsource.loaded.testdata/src/main/java/fields/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/One.java rename to org.springsource.loaded.testdata/src/main/java/fields/One.java diff --git a/org.springsource.loaded.testdata/src/fields/P.java b/org.springsource.loaded.testdata/src/main/java/fields/P.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/P.java rename to org.springsource.loaded.testdata/src/main/java/fields/P.java diff --git a/org.springsource.loaded.testdata/src/fields/Pa.java b/org.springsource.loaded.testdata/src/main/java/fields/Pa.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Pa.java rename to org.springsource.loaded.testdata/src/main/java/fields/Pa.java diff --git a/org.springsource.loaded.testdata/src/fields/Q.java b/org.springsource.loaded.testdata/src/main/java/fields/Q.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Q.java rename to org.springsource.loaded.testdata/src/main/java/fields/Q.java diff --git a/org.springsource.loaded.testdata/src/fields/Q2.java b/org.springsource.loaded.testdata/src/main/java/fields/Q2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Q2.java rename to org.springsource.loaded.testdata/src/main/java/fields/Q2.java diff --git a/org.springsource.loaded.testdata/src/fields/Qa.java b/org.springsource.loaded.testdata/src/main/java/fields/Qa.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Qa.java rename to org.springsource.loaded.testdata/src/main/java/fields/Qa.java diff --git a/org.springsource.loaded.testdata/src/fields/Qa2.java b/org.springsource.loaded.testdata/src/main/java/fields/Qa2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Qa2.java rename to org.springsource.loaded.testdata/src/main/java/fields/Qa2.java diff --git a/org.springsource.loaded.testdata/src/fields/Qc.java b/org.springsource.loaded.testdata/src/main/java/fields/Qc.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Qc.java rename to org.springsource.loaded.testdata/src/main/java/fields/Qc.java diff --git a/org.springsource.loaded.testdata/src/fields/Qc2.java b/org.springsource.loaded.testdata/src/main/java/fields/Qc2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Qc2.java rename to org.springsource.loaded.testdata/src/main/java/fields/Qc2.java diff --git a/org.springsource.loaded.testdata/src/fields/R.java b/org.springsource.loaded.testdata/src/main/java/fields/R.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/R.java rename to org.springsource.loaded.testdata/src/main/java/fields/R.java diff --git a/org.springsource.loaded.testdata/src/fields/Ra.java b/org.springsource.loaded.testdata/src/main/java/fields/Ra.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ra.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ra.java diff --git a/org.springsource.loaded.testdata/src/fields/Rc.java b/org.springsource.loaded.testdata/src/main/java/fields/Rc.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Rc.java rename to org.springsource.loaded.testdata/src/main/java/fields/Rc.java diff --git a/org.springsource.loaded.testdata/src/fields/ReloadableBottom.java b/org.springsource.loaded.testdata/src/main/java/fields/ReloadableBottom.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/ReloadableBottom.java rename to org.springsource.loaded.testdata/src/main/java/fields/ReloadableBottom.java diff --git a/org.springsource.loaded.testdata/src/fields/ReloadableTop.java b/org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/ReloadableTop.java rename to org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop.java diff --git a/org.springsource.loaded.testdata/src/fields/ReloadableTop002.java b/org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/ReloadableTop002.java rename to org.springsource.loaded.testdata/src/main/java/fields/ReloadableTop002.java diff --git a/org.springsource.loaded.testdata/src/fields/Removed.java b/org.springsource.loaded.testdata/src/main/java/fields/Removed.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Removed.java rename to org.springsource.loaded.testdata/src/main/java/fields/Removed.java diff --git a/org.springsource.loaded.testdata/src/fields/Removed002.java b/org.springsource.loaded.testdata/src/main/java/fields/Removed002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Removed002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Removed002.java diff --git a/org.springsource.loaded.testdata/src/fields/S.java b/org.springsource.loaded.testdata/src/main/java/fields/S.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/S.java rename to org.springsource.loaded.testdata/src/main/java/fields/S.java diff --git a/org.springsource.loaded.testdata/src/fields/S2.java b/org.springsource.loaded.testdata/src/main/java/fields/S2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/S2.java rename to org.springsource.loaded.testdata/src/main/java/fields/S2.java diff --git a/org.springsource.loaded.testdata/src/fields/T.java b/org.springsource.loaded.testdata/src/main/java/fields/T.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/T.java rename to org.springsource.loaded.testdata/src/main/java/fields/T.java diff --git a/org.springsource.loaded.testdata/src/fields/T2.java b/org.springsource.loaded.testdata/src/main/java/fields/T2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/T2.java rename to org.springsource.loaded.testdata/src/main/java/fields/T2.java diff --git a/org.springsource.loaded.testdata/src/fields/Two.java b/org.springsource.loaded.testdata/src/main/java/fields/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Two.java rename to org.springsource.loaded.testdata/src/main/java/fields/Two.java diff --git a/org.springsource.loaded.testdata/src/fields/TwoSlot.java b/org.springsource.loaded.testdata/src/main/java/fields/TwoSlot.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/TwoSlot.java rename to org.springsource.loaded.testdata/src/main/java/fields/TwoSlot.java diff --git a/org.springsource.loaded.testdata/src/fields/TwoSlot2.java b/org.springsource.loaded.testdata/src/main/java/fields/TwoSlot2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/TwoSlot2.java rename to org.springsource.loaded.testdata/src/main/java/fields/TwoSlot2.java diff --git a/org.springsource.loaded.testdata/src/fields/TypeChanging.java b/org.springsource.loaded.testdata/src/main/java/fields/TypeChanging.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/TypeChanging.java rename to org.springsource.loaded.testdata/src/main/java/fields/TypeChanging.java diff --git a/org.springsource.loaded.testdata/src/fields/TypeChanging2.java b/org.springsource.loaded.testdata/src/main/java/fields/TypeChanging2.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/TypeChanging2.java rename to org.springsource.loaded.testdata/src/main/java/fields/TypeChanging2.java diff --git a/org.springsource.loaded.testdata/src/fields/X.java b/org.springsource.loaded.testdata/src/main/java/fields/X.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/X.java rename to org.springsource.loaded.testdata/src/main/java/fields/X.java diff --git a/org.springsource.loaded.testdata/src/fields/X002.java b/org.springsource.loaded.testdata/src/main/java/fields/X002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/X002.java rename to org.springsource.loaded.testdata/src/main/java/fields/X002.java diff --git a/org.springsource.loaded.testdata/src/fields/Y.java b/org.springsource.loaded.testdata/src/main/java/fields/Y.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Y.java rename to org.springsource.loaded.testdata/src/main/java/fields/Y.java diff --git a/org.springsource.loaded.testdata/src/fields/Y002.java b/org.springsource.loaded.testdata/src/main/java/fields/Y002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Y002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Y002.java diff --git a/org.springsource.loaded.testdata/src/fields/Ya.java b/org.springsource.loaded.testdata/src/main/java/fields/Ya.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ya.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ya.java diff --git a/org.springsource.loaded.testdata/src/fields/Ya002.java b/org.springsource.loaded.testdata/src/main/java/fields/Ya002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Ya002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Ya002.java diff --git a/org.springsource.loaded.testdata/src/fields/Yb.java b/org.springsource.loaded.testdata/src/main/java/fields/Yb.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Yb.java rename to org.springsource.loaded.testdata/src/main/java/fields/Yb.java diff --git a/org.springsource.loaded.testdata/src/fields/Yb002.java b/org.springsource.loaded.testdata/src/main/java/fields/Yb002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Yb002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Yb002.java diff --git a/org.springsource.loaded.testdata/src/fields/Z.java b/org.springsource.loaded.testdata/src/main/java/fields/Z.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Z.java rename to org.springsource.loaded.testdata/src/main/java/fields/Z.java diff --git a/org.springsource.loaded.testdata/src/fields/Za.java b/org.springsource.loaded.testdata/src/main/java/fields/Za.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Za.java rename to org.springsource.loaded.testdata/src/main/java/fields/Za.java diff --git a/org.springsource.loaded.testdata/src/fields/Za002.java b/org.springsource.loaded.testdata/src/main/java/fields/Za002.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Za002.java rename to org.springsource.loaded.testdata/src/main/java/fields/Za002.java diff --git a/org.springsource.loaded.testdata/src/fields/Zb.java b/org.springsource.loaded.testdata/src/main/java/fields/Zb.java similarity index 100% rename from org.springsource.loaded.testdata/src/fields/Zb.java rename to org.springsource.loaded.testdata/src/main/java/fields/Zb.java diff --git a/org.springsource.loaded.testdata/src/inheritance/A.java b/org.springsource.loaded.testdata/src/main/java/inheritance/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/inheritance/A.java rename to org.springsource.loaded.testdata/src/main/java/inheritance/A.java diff --git a/org.springsource.loaded.testdata/src/inheritance/A002.java b/org.springsource.loaded.testdata/src/main/java/inheritance/A002.java similarity index 100% rename from org.springsource.loaded.testdata/src/inheritance/A002.java rename to org.springsource.loaded.testdata/src/main/java/inheritance/A002.java diff --git a/org.springsource.loaded.testdata/src/inheritance/B.java b/org.springsource.loaded.testdata/src/main/java/inheritance/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/inheritance/B.java rename to org.springsource.loaded.testdata/src/main/java/inheritance/B.java diff --git a/org.springsource.loaded.testdata/src/inheritance/C.java b/org.springsource.loaded.testdata/src/main/java/inheritance/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/inheritance/C.java rename to org.springsource.loaded.testdata/src/main/java/inheritance/C.java diff --git a/org.springsource.loaded.testdata/src/inners/Four.java b/org.springsource.loaded.testdata/src/main/java/inners/Four.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Four.java rename to org.springsource.loaded.testdata/src/main/java/inners/Four.java diff --git a/org.springsource.loaded.testdata/src/inners/Four2.java b/org.springsource.loaded.testdata/src/main/java/inners/Four2.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Four2.java rename to org.springsource.loaded.testdata/src/main/java/inners/Four2.java diff --git a/org.springsource.loaded.testdata/src/inners/One.java b/org.springsource.loaded.testdata/src/main/java/inners/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/One.java rename to org.springsource.loaded.testdata/src/main/java/inners/One.java diff --git a/org.springsource.loaded.testdata/src/inners/One2.java b/org.springsource.loaded.testdata/src/main/java/inners/One2.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/One2.java rename to org.springsource.loaded.testdata/src/main/java/inners/One2.java diff --git a/org.springsource.loaded.testdata/src/inners/Three.java b/org.springsource.loaded.testdata/src/main/java/inners/Three.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Three.java rename to org.springsource.loaded.testdata/src/main/java/inners/Three.java diff --git a/org.springsource.loaded.testdata/src/inners/Three2.java b/org.springsource.loaded.testdata/src/main/java/inners/Three2.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Three2.java rename to org.springsource.loaded.testdata/src/main/java/inners/Three2.java diff --git a/org.springsource.loaded.testdata/src/inners/Two.java b/org.springsource.loaded.testdata/src/main/java/inners/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Two.java rename to org.springsource.loaded.testdata/src/main/java/inners/Two.java diff --git a/org.springsource.loaded.testdata/src/inners/Two2.java b/org.springsource.loaded.testdata/src/main/java/inners/Two2.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/Two2.java rename to org.springsource.loaded.testdata/src/main/java/inners/Two2.java diff --git a/org.springsource.loaded.testdata/src/inners/TwoDefault.java b/org.springsource.loaded.testdata/src/main/java/inners/TwoDefault.java similarity index 100% rename from org.springsource.loaded.testdata/src/inners/TwoDefault.java rename to org.springsource.loaded.testdata/src/main/java/inners/TwoDefault.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheImpl.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheImpl.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheImpl002.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl002.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheImpl002.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheImpl002.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheInterface.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheInterface.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheInterface002.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheInterface002.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheInterface002.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheRunner.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheRunner.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner.java diff --git a/org.springsource.loaded.testdata/src/interfacerewriting/TheRunner002.java b/org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner002.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfacerewriting/TheRunner002.java rename to org.springsource.loaded.testdata/src/main/java/interfacerewriting/TheRunner002.java diff --git a/org.springsource.loaded.testdata/src/interfaces/Runner.java b/org.springsource.loaded.testdata/src/main/java/interfaces/Runner.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/Runner.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/Runner.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheImplementation.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheImplementation.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheImplementation002.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation002.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheImplementation002.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation002.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheImplementation003.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation003.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheImplementation003.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation003.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheImplementation004.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation004.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheImplementation004.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheImplementation004.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheInterface.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheInterface.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface.java diff --git a/org.springsource.loaded.testdata/src/interfaces/TheInterface004.java b/org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface004.java similarity index 100% rename from org.springsource.loaded.testdata/src/interfaces/TheInterface004.java rename to org.springsource.loaded.testdata/src/main/java/interfaces/TheInterface004.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/A.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/A.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/A.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/A002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/A002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/A002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/A002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Able.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Able.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Able.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Able.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Able2.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Able2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Able2.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Able2.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Able2002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Able2002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Able2002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Able2002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/B.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/B.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/B.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/B002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/B002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/B002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/B002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/C.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/C.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/C.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls003.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCalls003.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCalls003.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCallsB.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCallsB.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCallsB002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/ContainsPrivateCallsB002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/ContainsPrivateCallsB002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/P.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/P.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/P.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/P.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/P002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/P002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/P002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/P002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Q.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Q.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Q.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Q.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/R.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/R.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/R.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/R.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Simple.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Simple.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Simple.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Simple.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Simple2.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Simple2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Simple2.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Simple2.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/X.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/X.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/X.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/X.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/X002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/X002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/X002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/X002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/XX.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/XX.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/XX.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/XX.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Y.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Y.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Y.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Y.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Y002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Y002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Y002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Y002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Y003.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Y003.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Y003.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Y003.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/YY.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/YY.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/YY.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/YY.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/YY002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/YY002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/YY002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/YY002.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Z.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Z.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Z.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Z.java diff --git a/org.springsource.loaded.testdata/src/invokespecial/Z002.java b/org.springsource.loaded.testdata/src/main/java/invokespecial/Z002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokespecial/Z002.java rename to org.springsource.loaded.testdata/src/main/java/invokespecial/Z002.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/A.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/A.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/A.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/A2.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/A2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/A2.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/A2.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/B.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/B.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/B.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/B2.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/B2.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/B2.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/A.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/A.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/A.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/AA.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AA.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/AA.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AA.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/AAA.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AAA.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/AAA.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AAA.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/AB.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/AB.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/AB.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/B.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/B.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/B.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/BB.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/BB.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BB.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/BBB.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/BBB.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBB.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/BBBB.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/BBBB.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBB.java diff --git a/org.springsource.loaded.testdata/src/invokestatic/issue4/BBBBB.java b/org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBBB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokestatic/issue4/BBBBB.java rename to org.springsource.loaded.testdata/src/main/java/invokestatic/issue4/BBBBB.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/A.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/A.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/A.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/A2.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/A2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/A2.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/A2.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/AA.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/AA.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/AA.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/AA.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/AA2.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/AA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/AA2.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/AA2.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/B.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/B.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/B.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/B2.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/B2.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/B2.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/BB.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/BB.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/BB.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/BB2.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/BB2.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/BB2.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/BB3.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/BB3.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/BB3.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/BB3.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/CC.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/CC.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/CC.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/CC.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/X.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/X.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/X.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/X.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/XX.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/XX.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/XX.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/XX.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/Y.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/Y.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/Y.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/Y.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/Y002.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/Y002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/Y002.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/Y002.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/YY.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/YY.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/YY.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/YY.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/YY002.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/YY002.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/YY002.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/YY002.java diff --git a/org.springsource.loaded.testdata/src/invokevirtual/ZZ.java b/org.springsource.loaded.testdata/src/main/java/invokevirtual/ZZ.java similarity index 100% rename from org.springsource.loaded.testdata/src/invokevirtual/ZZ.java rename to org.springsource.loaded.testdata/src/main/java/invokevirtual/ZZ.java diff --git a/org.springsource.loaded.testdata/src/iri/Ctor.java b/org.springsource.loaded.testdata/src/main/java/iri/Ctor.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/Ctor.java rename to org.springsource.loaded.testdata/src/main/java/iri/Ctor.java diff --git a/org.springsource.loaded.testdata/src/iri/FormattingHelper.java b/org.springsource.loaded.testdata/src/main/java/iri/FormattingHelper.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/FormattingHelper.java rename to org.springsource.loaded.testdata/src/main/java/iri/FormattingHelper.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetAnnotation.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetAnnotation.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetAnnotation2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetAnnotation2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotation2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructor.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructor.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructor2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructor2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructor2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructorB.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructorB.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructorB2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructorB2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructorB2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructors.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructors.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetConstructors2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetConstructors2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetConstructors2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecConstructor.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecConstructor.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecConstructor2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecConstructor2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructor2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecConstructors.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecConstructors.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecConstructors2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecConstructors2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecConstructors2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecField.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecField.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecField2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecField2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecField2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecFields.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecFields.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecFields2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecFields2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecFields2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecMethod.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecMethod.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecMethod2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecMethod2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecMethod3.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod3.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecMethod3.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethod3.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecMethods.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecMethods.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetDecMethods2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetDecMethods2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetDecMethods2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetField.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetField.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetField.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetField.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetField2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetField2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetField2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetField2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetFields.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetFields.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetFields2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetFields2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetFields2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetMethod.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetMethod.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetMethod2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetMethod2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetMethod3.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod3.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetMethod3.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethod3.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetMethods.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetMethods.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetMethods2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetMethods2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetMethods2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCGetModifiers.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCGetModifiers.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCGetModifiers.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCGetModifiers.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCIsAnnotationPresent.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCIsAnnotationPresent.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCIsAnnotationPresent2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCIsAnnotationPresent2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCIsAnnotationPresent2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLCNewInstance.java b/org.springsource.loaded.testdata/src/main/java/iri/JLCNewInstance.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLCNewInstance.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLCNewInstance.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetAnnotation.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetAnnotation.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetAnnotation2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetAnnotation2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotation2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetDecAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetDecAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetDecAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetDecAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetDecAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetParameterAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetParameterAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCGetParameterAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCGetParameterAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCGetParameterAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCIsAnnotationPresent.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCIsAnnotationPresent.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCIsAnnotationPresent2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCIsAnnotationPresent2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCIsAnnotationPresent2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCNewInstance.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCNewInstance.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRCNewInstance2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRCNewInstance2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRCNewInstance2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGet.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGet.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGet.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGet.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGet2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGet2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGet2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGet2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetAnnotation.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetAnnotation.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetAnnotation2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetAnnotation2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotation2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetDecAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetDecAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetDecAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetDecAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetDecAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetTheRest.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetTheRest.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFGetTheRest2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFGetTheRest2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFGetTheRest2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFIsAnnotationPresent.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFIsAnnotationPresent.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFIsAnnotationPresent2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFIsAnnotationPresent2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFIsAnnotationPresent2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFSet.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFSet.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFSet.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFSet.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFSet2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFSet2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFSet2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFSet2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFSetTheRest.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFSetTheRest.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFSetTheRest2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFSetTheRest2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRest2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRFSetTheRestVariant.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRestVariant.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRFSetTheRestVariant.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRFSetTheRestVariant.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotation.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotation.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotation2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotation2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotation2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAccessibleObject2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAccessibleObject2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotationViaAnnotatedElement2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotationViaAnnotatedElement2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetDecAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetDecAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetDecAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetDecAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetDecAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetParameterAnnotations.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetParameterAnnotations.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMGetParameterAnnotations2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMGetParameterAnnotations2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMGetParameterAnnotations2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMInvoke.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMInvoke.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMInvoke2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMInvoke2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke2.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMInvoke3.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke3.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMInvoke3.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMInvoke3.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMIsAnnotationPresent.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMIsAnnotationPresent.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent.java diff --git a/org.springsource.loaded.testdata/src/iri/JLRMIsAnnotationPresent2.java b/org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java similarity index 100% rename from org.springsource.loaded.testdata/src/iri/JLRMIsAnnotationPresent2.java rename to org.springsource.loaded.testdata/src/main/java/iri/JLRMIsAnnotationPresent2.java diff --git a/org.springsource.loaded.testdata/src/jvmtwo/Runner.java b/org.springsource.loaded.testdata/src/main/java/jvmtwo/Runner.java similarity index 100% rename from org.springsource.loaded.testdata/src/jvmtwo/Runner.java rename to org.springsource.loaded.testdata/src/main/java/jvmtwo/Runner.java diff --git a/org.springsource.loaded.testdata/src/methoddeletion/TypeA.java b/org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA.java similarity index 100% rename from org.springsource.loaded.testdata/src/methoddeletion/TypeA.java rename to org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA.java diff --git a/org.springsource.loaded.testdata/src/methoddeletion/TypeA2.java b/org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/methoddeletion/TypeA2.java rename to org.springsource.loaded.testdata/src/main/java/methoddeletion/TypeA2.java diff --git a/org.springsource.loaded.testdata/src/perf/one/Caller.java b/org.springsource.loaded.testdata/src/main/java/perf/one/Caller.java similarity index 100% rename from org.springsource.loaded.testdata/src/perf/one/Caller.java rename to org.springsource.loaded.testdata/src/main/java/perf/one/Caller.java diff --git a/org.springsource.loaded.testdata/src/perf/one/CallerB.java b/org.springsource.loaded.testdata/src/main/java/perf/one/CallerB.java similarity index 100% rename from org.springsource.loaded.testdata/src/perf/one/CallerB.java rename to org.springsource.loaded.testdata/src/main/java/perf/one/CallerB.java diff --git a/org.springsource.loaded.testdata/src/perf/one/Target.java b/org.springsource.loaded.testdata/src/main/java/perf/one/Target.java similarity index 100% rename from org.springsource.loaded.testdata/src/perf/one/Target.java rename to org.springsource.loaded.testdata/src/main/java/perf/one/Target.java diff --git a/org.springsource.loaded.testdata/src/perf/one/TargetB.java b/org.springsource.loaded.testdata/src/main/java/perf/one/TargetB.java similarity index 100% rename from org.springsource.loaded.testdata/src/perf/one/TargetB.java rename to org.springsource.loaded.testdata/src/main/java/perf/one/TargetB.java diff --git a/org.springsource.loaded.testdata/src/plugins/One.java b/org.springsource.loaded.testdata/src/main/java/plugins/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/plugins/One.java rename to org.springsource.loaded.testdata/src/main/java/plugins/One.java diff --git a/org.springsource.loaded.testdata/src/plugins/PluginTesting.java b/org.springsource.loaded.testdata/src/main/java/plugins/PluginTesting.java similarity index 100% rename from org.springsource.loaded.testdata/src/plugins/PluginTesting.java rename to org.springsource.loaded.testdata/src/main/java/plugins/PluginTesting.java diff --git a/org.springsource.loaded.testdata/src/prot/One.java b/org.springsource.loaded.testdata/src/main/java/prot/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/One.java rename to org.springsource.loaded.testdata/src/main/java/prot/One.java diff --git a/org.springsource.loaded.testdata/src/prot/PeerThree.java b/org.springsource.loaded.testdata/src/main/java/prot/PeerThree.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/PeerThree.java rename to org.springsource.loaded.testdata/src/main/java/prot/PeerThree.java diff --git a/org.springsource.loaded.testdata/src/prot/SubOne.java b/org.springsource.loaded.testdata/src/main/java/prot/SubOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/SubOne.java rename to org.springsource.loaded.testdata/src/main/java/prot/SubOne.java diff --git a/org.springsource.loaded.testdata/src/prot/SubThree.java b/org.springsource.loaded.testdata/src/main/java/prot/SubThree.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/SubThree.java rename to org.springsource.loaded.testdata/src/main/java/prot/SubThree.java diff --git a/org.springsource.loaded.testdata/src/prot/SubTwo.java b/org.springsource.loaded.testdata/src/main/java/prot/SubTwo.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/SubTwo.java rename to org.springsource.loaded.testdata/src/main/java/prot/SubTwo.java diff --git a/org.springsource.loaded.testdata/src/prot/Three.java b/org.springsource.loaded.testdata/src/main/java/prot/Three.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/Three.java rename to org.springsource.loaded.testdata/src/main/java/prot/Three.java diff --git a/org.springsource.loaded.testdata/src/prot/Two.java b/org.springsource.loaded.testdata/src/main/java/prot/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/prot/Two.java rename to org.springsource.loaded.testdata/src/main/java/prot/Two.java diff --git a/org.springsource.loaded.testdata/src/proxy/TestA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/TestA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/TestA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/TestA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/TestA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/TestA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/TestA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/TestA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/TestIntfaceA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/TestIntfaceA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/TestIntfaceA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/TestIntfaceA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/TestIntfaceA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/TestInvocationHandlerA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/TestInvocationHandlerA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/TestInvocationHandlerA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/TestInvocationHandlerA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestIntfaceA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestIntfaceA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestIntfaceA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestIntfaceA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestIntfaceB1.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestIntfaceB1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB1.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestIntfaceB2.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestIntfaceB2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestIntfaceB2.java diff --git a/org.springsource.loaded.testdata/src/proxy/three/TestInvocationHandlerA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/three/TestInvocationHandlerA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/three/TestInvocationHandlerA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/two/TestA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/two/TestA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/two/TestA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/two/TestA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/two/TestA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/two/TestA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/two/TestA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/two/TestA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/two/TestIntfaceA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/two/TestIntfaceA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA1.java diff --git a/org.springsource.loaded.testdata/src/proxy/two/TestIntfaceA2.java b/org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA2.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/two/TestIntfaceA2.java rename to org.springsource.loaded.testdata/src/main/java/proxy/two/TestIntfaceA2.java diff --git a/org.springsource.loaded.testdata/src/proxy/two/TestInvocationHandlerA1.java b/org.springsource.loaded.testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java similarity index 100% rename from org.springsource.loaded.testdata/src/proxy/two/TestInvocationHandlerA1.java rename to org.springsource.loaded.testdata/src/main/java/proxy/two/TestInvocationHandlerA1.java diff --git a/org.springsource.loaded.testdata/src/reflect/FieldAccessing.java b/org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflect/FieldAccessing.java rename to org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing.java diff --git a/org.springsource.loaded.testdata/src/reflect/FieldAccessing2.java b/org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing2.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflect/FieldAccessing2.java rename to org.springsource.loaded.testdata/src/main/java/reflect/FieldAccessing2.java diff --git a/org.springsource.loaded.testdata/src/reflect/FieldWriting.java b/org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflect/FieldWriting.java rename to org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting.java diff --git a/org.springsource.loaded.testdata/src/reflect/FieldWriting2.java b/org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting2.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflect/FieldWriting2.java rename to org.springsource.loaded.testdata/src/main/java/reflect/FieldWriting2.java diff --git a/org.springsource.loaded.testdata/src/reflection/AdHocClassInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/AdHocClassInvoker.java similarity index 96% rename from org.springsource.loaded.testdata/src/reflection/AdHocClassInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AdHocClassInvoker.java index e963a8d..b0c05f9 100644 --- a/org.springsource.loaded.testdata/src/reflection/AdHocClassInvoker.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AdHocClassInvoker.java @@ -1,129 +1,129 @@ -package reflection; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.List; - -import reflection.targets.ClassTarget; - -/** - * A rather 'add-hoc' created ClassInvoker containing various bits and pieces of reflective code that calls (mostly) methods in the - * class API. - *

- * This is renamed from 'ClassInvoker' which has since been replaced with a more systematic 'generated' Invoker class. - * - * @author kdvolder - */ -public class AdHocClassInvoker { - - static ClassTarget t = new ClassTarget(); - - public Field callGetDeclaredField(Class clazz, String fieldName) throws Exception { - return clazz.getDeclaredField(fieldName); - } - - public Field callGetDeclaredFieldForThisName(Class clazz, String name) throws Exception { - Field f = clazz.getDeclaredField(name); - return f; - } - - public List callClassGetDeclaredFields(Class clazz) throws Exception { - return Arrays.asList(clazz.getDeclaredFields()); - } - - public List callClassGetFields(Class clazz) throws Exception { - return Arrays.asList(clazz.getFields()); - } - - public int callClassGetModifiers(Class clazz) throws Exception { - System.out.println(clazz); - System.out.println(clazz.getModifiers()); - return clazz.getModifiers(); - } - - public Field callClassGetField(Class clazz, String name) throws Exception { - return clazz.getField(name); - } - - public Field callClassGetDeclaredField(Class clazz, String name) throws Exception { - return clazz.getDeclaredField(name); - } - - public Method callGetDeclaredMethod(Class clazz, String name, Class... params) throws Exception { - return clazz.getDeclaredMethod(name, params); - } - - public Method callGetDeclaredMethodForThisName(Class clazz, String name, Class... paramTypes) throws Exception { - Method m = clazz.getDeclaredMethod(name, paramTypes); - return m; - } - - public List callGetDeclaredMethods(Class clazz) throws Exception { - return Arrays.asList(clazz.getDeclaredMethods()); - } - - public List callGetMethods(Class clazz) throws Exception { - return Arrays.asList(clazz.getMethods()); - } - - public Method callGetMethod(Class clazz, String name, Class... params) throws SecurityException, NoSuchMethodException { - return clazz.getMethod(name, params); - } - - public Constructor callGetDeclaredConstructor(Class clazz, Class... params) throws SecurityException, - NoSuchMethodException { - return clazz.getDeclaredConstructor(params); - } - - public Constructor[] callGetDeclaredConstructors(Class clazz) throws SecurityException, NoSuchMethodException { - return clazz.getDeclaredConstructors(); - } - - public T callNewInstance(Constructor ctor, Object... params) throws IllegalArgumentException, InstantiationException, - IllegalAccessException, InvocationTargetException { - return ctor.newInstance(params); - } - - /** - * Calls private method in reloadable class, can override access constraints if requested to do so. - */ - public String callMethodWithAccess(String whichMethod, boolean setAccess) throws Exception { - Method theMethod = ClassTarget.class.getDeclaredMethod(whichMethod); - if (setAccess) { - theMethod.setAccessible(true); - } - return (String) theMethod.invoke(t); - } - - public Object getFieldValue(Field f) throws Exception { - return f.get(t); - } - - public Object runThisMethod(Method m) throws Exception { - return m.invoke(t); - } - - public Object runThisMethodOn(Object t, Method m, Object... args) throws Exception { - return m.invoke(t, args); - } - - public Object runThisMethodWithParam(Method m, Object[] params) throws Exception { - return m.invoke(t, params); - } - - public void setFieldValue(Field f, Object newValue) throws Exception { - f.set(t, newValue); - } - - public boolean callMethodIsSynthetic(Method m) { - return m.isSynthetic(); - } - - public boolean callMethodIsBridge(Method m) { - return m.isBridge(); - } - -} +package reflection; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; + +import reflection.targets.ClassTarget; + +/** + * A rather 'add-hoc' created ClassInvoker containing various bits and pieces of reflective code that calls (mostly) methods in the + * class API. + *

+ * This is renamed from 'ClassInvoker' which has since been replaced with a more systematic 'generated' Invoker class. + * + * @author kdvolder + */ +public class AdHocClassInvoker { + + static ClassTarget t = new ClassTarget(); + + public Field callGetDeclaredField(Class clazz, String fieldName) throws Exception { + return clazz.getDeclaredField(fieldName); + } + + public Field callGetDeclaredFieldForThisName(Class clazz, String name) throws Exception { + Field f = clazz.getDeclaredField(name); + return f; + } + + public List callClassGetDeclaredFields(Class clazz) throws Exception { + return Arrays.asList(clazz.getDeclaredFields()); + } + + public List callClassGetFields(Class clazz) throws Exception { + return Arrays.asList(clazz.getFields()); + } + + public int callClassGetModifiers(Class clazz) throws Exception { + System.out.println(clazz); + System.out.println(clazz.getModifiers()); + return clazz.getModifiers(); + } + + public Field callClassGetField(Class clazz, String name) throws Exception { + return clazz.getField(name); + } + + public Field callClassGetDeclaredField(Class clazz, String name) throws Exception { + return clazz.getDeclaredField(name); + } + + public Method callGetDeclaredMethod(Class clazz, String name, Class... params) throws Exception { + return clazz.getDeclaredMethod(name, params); + } + + public Method callGetDeclaredMethodForThisName(Class clazz, String name, Class... paramTypes) throws Exception { + Method m = clazz.getDeclaredMethod(name, paramTypes); + return m; + } + + public List callGetDeclaredMethods(Class clazz) throws Exception { + return Arrays.asList(clazz.getDeclaredMethods()); + } + + public List callGetMethods(Class clazz) throws Exception { + return Arrays.asList(clazz.getMethods()); + } + + public Method callGetMethod(Class clazz, String name, Class... params) throws SecurityException, NoSuchMethodException { + return clazz.getMethod(name, params); + } + + public Constructor callGetDeclaredConstructor(Class clazz, Class... params) throws SecurityException, + NoSuchMethodException { + return clazz.getDeclaredConstructor(params); + } + + public Constructor[] callGetDeclaredConstructors(Class clazz) throws SecurityException, NoSuchMethodException { + return clazz.getDeclaredConstructors(); + } + + public T callNewInstance(Constructor ctor, Object... params) throws IllegalArgumentException, InstantiationException, + IllegalAccessException, InvocationTargetException { + return ctor.newInstance(params); + } + + /** + * Calls private method in reloadable class, can override access constraints if requested to do so. + */ + public String callMethodWithAccess(String whichMethod, boolean setAccess) throws Exception { + Method theMethod = ClassTarget.class.getDeclaredMethod(whichMethod); + if (setAccess) { + theMethod.setAccessible(true); + } + return (String) theMethod.invoke(t); + } + + public Object getFieldValue(Field f) throws Exception { + return f.get(t); + } + + public Object runThisMethod(Method m) throws Exception { + return m.invoke(t); + } + + public Object runThisMethodOn(Object t, Method m, Object... args) throws Exception { + return m.invoke(t, args); + } + + public Object runThisMethodWithParam(Method m, Object[] params) throws Exception { + return m.invoke(t, params); + } + + public void setFieldValue(Field f, Object newValue) throws Exception { + f.set(t, newValue); + } + + public boolean callMethodIsSynthetic(Method m) { + return m.isSynthetic(); + } + + public boolean callMethodIsBridge(Method m) { + return m.isBridge(); + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/AnnoT.java b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/AnnoT.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AnnoT.java index eb4f9f2..e049800 100644 --- a/org.springsource.loaded.testdata/src/reflection/AnnoT.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT.java @@ -1,8 +1,8 @@ -package reflection; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface AnnoT { -} +package reflection; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoT { +} diff --git a/org.springsource.loaded.testdata/src/reflection/AnnoT2.java b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT2.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/AnnoT2.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AnnoT2.java index c0bce0d..7504ba7 100644 --- a/org.springsource.loaded.testdata/src/reflection/AnnoT2.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT2.java @@ -1,8 +1,8 @@ -package reflection; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface AnnoT2 { -} +package reflection; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoT2 { +} diff --git a/org.springsource.loaded.testdata/src/reflection/AnnoT3.java b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT3.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/AnnoT3.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AnnoT3.java index 7b7ea73..8d520fb 100644 --- a/org.springsource.loaded.testdata/src/reflection/AnnoT3.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoT3.java @@ -1,9 +1,9 @@ -package reflection; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface AnnoT3 { - String value(); -} +package reflection; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoT3 { + String value(); +} diff --git a/org.springsource.loaded.testdata/src/reflection/AnnoTInherit.java b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoTInherit.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/AnnoTInherit.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AnnoTInherit.java index e3e7a1e..5aec159 100644 --- a/org.springsource.loaded.testdata/src/reflection/AnnoTInherit.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AnnoTInherit.java @@ -1,11 +1,11 @@ -package reflection; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Inherited -@Retention(RetentionPolicy.RUNTIME) -public @interface AnnoTInherit { - String value(); -} +package reflection; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Inherited +@Retention(RetentionPolicy.RUNTIME) +public @interface AnnoTInherit { + String value(); +} diff --git a/org.springsource.loaded.testdata/src/reflection/AnnotationsInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/AnnotationsInvoker.java similarity index 97% rename from org.springsource.loaded.testdata/src/reflection/AnnotationsInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/AnnotationsInvoker.java index bdd9bf8..ffeaab4 100644 --- a/org.springsource.loaded.testdata/src/reflection/AnnotationsInvoker.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/AnnotationsInvoker.java @@ -1,127 +1,127 @@ -package reflection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.AccessibleObject; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * A class that provides method containing test code that calls different reflective methods related to annotations. - * - * @author kdvolder - */ -public class AnnotationsInvoker { - - /////////////////////////////////////////// - // AnnotatedElement - public List callAnnotatedElementGetAnnotations(AnnotatedElement m) { - return Arrays.asList(m.getAnnotations()); - } - public List callAnnotatedElementGetDeclaredAnnotations(AnnotatedElement m) { - return Arrays.asList(m.getDeclaredAnnotations()); - } - public Annotation callAnnotatedElementGetAnnotation(AnnotatedElement m, Class annotClass) { - return m.getAnnotation(annotClass); - } - public boolean callAnnotatedElementIsAnnotationPresent(AnnotatedElement m, Class annotClass) { - return m.isAnnotationPresent(annotClass); - } - - /////////////////////////////////////////// - // AccessibleObject - public List callAccessibleObjectGetAnnotations(AccessibleObject m) { - return Arrays.asList(m.getAnnotations()); - } - public List callAccessibleObjectGetDeclaredAnnotations(AccessibleObject m) { - return Arrays.asList(m.getDeclaredAnnotations()); - } - public Annotation callAccessibleObjectGetAnnotation(AccessibleObject m, Class annotClass) { - return m.getAnnotation(annotClass); - } - public boolean callAccessibleObjectIsAnnotationPresent(AccessibleObject m, Class annotClass) { - return m.isAnnotationPresent(annotClass); - } - - /////////////////////////////////////////// - // Method - public List callMethodGetAnnotations(Method m) { - return Arrays.asList(m.getAnnotations()); - } - public List callMethodGetDeclaredAnnotations(Method m) { - return Arrays.asList(m.getDeclaredAnnotations()); - } - public boolean callMethodIsAnnotationPresent(Method m, Class annotClass) { - return m.isAnnotationPresent(annotClass); - } - public Annotation callMethodGetAnnotation(Method m, Class annotClass) { - return m.getAnnotation(annotClass); - } - public List> callMethodGetParameterAnnotations(Method m) { - Annotation[][] array = m.getParameterAnnotations(); - List> result = new ArrayList>(array.length); - for (int i = 0; i < array.length; i++) { - result.add(Arrays.asList(array[i])); - } - return result; - } - - /////////////////////////////////////////// - // Constructor - public List callConstructorGetAnnotations(Constructor m) { - return Arrays.asList(m.getAnnotations()); - } - public List callConstructorGetDeclaredAnnotations(Constructor m) { - return Arrays.asList(m.getDeclaredAnnotations()); - } - public boolean callConstructorIsAnnotationPresent(Constructor m, Class annotClass) { - return m.isAnnotationPresent(annotClass); - } - public Annotation callConstructorGetAnnotation(Constructor m, Class annotClass) { - return m.getAnnotation(annotClass); - } - public List> callConstructorGetParameterAnnotations(Constructor m) { - Annotation[][] array = m.getParameterAnnotations(); - List> result = new ArrayList>(array.length); - for (int i = 0; i < array.length; i++) { - result.add(Arrays.asList(array[i])); - } - return result; - } - - /////////////////////////////////////////// - // Field - public List callFieldGetAnnotations(Field m) { - return Arrays.asList(m.getAnnotations()); - } - public List callFieldGetDeclaredAnnotations(Field m) { - return Arrays.asList(m.getDeclaredAnnotations()); - } - public boolean callFieldIsAnnotationPresent(Field m, Class annotClass) { - return m.isAnnotationPresent(annotClass); - } - public Annotation callFieldGetAnnotation(Field m, Class annotClass) { - return m.getAnnotation(annotClass); - } - - - /////////////////////////////////////////// - // Class - public List callClassGetAnnotations(Class c) { - return Arrays.asList(c.getAnnotations()); - } - public List callClassGetDeclaredAnnotations(Class c) { - return Arrays.asList(c.getDeclaredAnnotations()); - } - public boolean callClassIsAnnotationPresent(Class c, Class annotClass) { - return c.isAnnotationPresent(annotClass); - } - public Annotation callClassGetAnnotation(Class c, Class annotClass) { - return c.getAnnotation(annotClass); - } - -} +package reflection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * A class that provides method containing test code that calls different reflective methods related to annotations. + * + * @author kdvolder + */ +public class AnnotationsInvoker { + + /////////////////////////////////////////// + // AnnotatedElement + public List callAnnotatedElementGetAnnotations(AnnotatedElement m) { + return Arrays.asList(m.getAnnotations()); + } + public List callAnnotatedElementGetDeclaredAnnotations(AnnotatedElement m) { + return Arrays.asList(m.getDeclaredAnnotations()); + } + public Annotation callAnnotatedElementGetAnnotation(AnnotatedElement m, Class annotClass) { + return m.getAnnotation(annotClass); + } + public boolean callAnnotatedElementIsAnnotationPresent(AnnotatedElement m, Class annotClass) { + return m.isAnnotationPresent(annotClass); + } + + /////////////////////////////////////////// + // AccessibleObject + public List callAccessibleObjectGetAnnotations(AccessibleObject m) { + return Arrays.asList(m.getAnnotations()); + } + public List callAccessibleObjectGetDeclaredAnnotations(AccessibleObject m) { + return Arrays.asList(m.getDeclaredAnnotations()); + } + public Annotation callAccessibleObjectGetAnnotation(AccessibleObject m, Class annotClass) { + return m.getAnnotation(annotClass); + } + public boolean callAccessibleObjectIsAnnotationPresent(AccessibleObject m, Class annotClass) { + return m.isAnnotationPresent(annotClass); + } + + /////////////////////////////////////////// + // Method + public List callMethodGetAnnotations(Method m) { + return Arrays.asList(m.getAnnotations()); + } + public List callMethodGetDeclaredAnnotations(Method m) { + return Arrays.asList(m.getDeclaredAnnotations()); + } + public boolean callMethodIsAnnotationPresent(Method m, Class annotClass) { + return m.isAnnotationPresent(annotClass); + } + public Annotation callMethodGetAnnotation(Method m, Class annotClass) { + return m.getAnnotation(annotClass); + } + public List> callMethodGetParameterAnnotations(Method m) { + Annotation[][] array = m.getParameterAnnotations(); + List> result = new ArrayList>(array.length); + for (int i = 0; i < array.length; i++) { + result.add(Arrays.asList(array[i])); + } + return result; + } + + /////////////////////////////////////////// + // Constructor + public List callConstructorGetAnnotations(Constructor m) { + return Arrays.asList(m.getAnnotations()); + } + public List callConstructorGetDeclaredAnnotations(Constructor m) { + return Arrays.asList(m.getDeclaredAnnotations()); + } + public boolean callConstructorIsAnnotationPresent(Constructor m, Class annotClass) { + return m.isAnnotationPresent(annotClass); + } + public Annotation callConstructorGetAnnotation(Constructor m, Class annotClass) { + return m.getAnnotation(annotClass); + } + public List> callConstructorGetParameterAnnotations(Constructor m) { + Annotation[][] array = m.getParameterAnnotations(); + List> result = new ArrayList>(array.length); + for (int i = 0; i < array.length; i++) { + result.add(Arrays.asList(array[i])); + } + return result; + } + + /////////////////////////////////////////// + // Field + public List callFieldGetAnnotations(Field m) { + return Arrays.asList(m.getAnnotations()); + } + public List callFieldGetDeclaredAnnotations(Field m) { + return Arrays.asList(m.getDeclaredAnnotations()); + } + public boolean callFieldIsAnnotationPresent(Field m, Class annotClass) { + return m.isAnnotationPresent(annotClass); + } + public Annotation callFieldGetAnnotation(Field m, Class annotClass) { + return m.getAnnotation(annotClass); + } + + + /////////////////////////////////////////// + // Class + public List callClassGetAnnotations(Class c) { + return Arrays.asList(c.getAnnotations()); + } + public List callClassGetDeclaredAnnotations(Class c) { + return Arrays.asList(c.getDeclaredAnnotations()); + } + public boolean callClassIsAnnotationPresent(Class c, Class annotClass) { + return c.isAnnotationPresent(annotClass); + } + public Annotation callClassGetAnnotation(Class c, Class annotClass) { + return c.getAnnotation(annotClass); + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/CTAnnoT.java b/org.springsource.loaded.testdata/src/main/java/reflection/CTAnnoT.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/CTAnnoT.java rename to org.springsource.loaded.testdata/src/main/java/reflection/CTAnnoT.java index 8f39505..eab942f 100644 --- a/org.springsource.loaded.testdata/src/reflection/CTAnnoT.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/CTAnnoT.java @@ -1,8 +1,8 @@ -package reflection; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.CLASS) -public @interface CTAnnoT { -} +package reflection; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.CLASS) +public @interface CTAnnoT { +} diff --git a/org.springsource.loaded.testdata/src/reflection/ClassInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/ClassInvoker.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/ClassInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/ClassInvoker.java diff --git a/org.springsource.loaded.testdata/src/reflection/ConstructorInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/ConstructorInvoker.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/ConstructorInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/ConstructorInvoker.java diff --git a/org.springsource.loaded.testdata/src/reflection/FieldInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/FieldInvoker.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/FieldInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/FieldInvoker.java diff --git a/org.springsource.loaded.testdata/src/reflection/Invoker.class b/org.springsource.loaded.testdata/src/main/java/reflection/Invoker.class similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/Invoker.class rename to org.springsource.loaded.testdata/src/main/java/reflection/Invoker.class diff --git a/org.springsource.loaded.testdata/src/reflection/Invoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/Invoker.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/Invoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/Invoker.java index 663f529..bc6b703 100644 --- a/org.springsource.loaded.testdata/src/reflection/Invoker.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/Invoker.java @@ -1,334 +1,334 @@ -package reflection; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; - -public class Invoker { - - static Field f_i; // int - static Field f_z; // boolean - static Field f_zarray; // boolean[] - static Field f_is; // static int - static Field f_b; // byte - static Field f_c; // char - static Field f_s; // short - static Field f_j; // long - static Field f_f; // float - static Field f_d; // double - static Field f_l; // reference (String) - static Field f_annotated; // annotated field - static Target t = new Target(); - - { - try { - f_i = Target.class.getDeclaredField("i"); - f_z = Target.class.getDeclaredField("z"); - f_zarray = Target.class.getDeclaredField("zs"); - f_is = Target.class.getDeclaredField("is"); - f_b = Target.class.getDeclaredField("b"); - f_c = Target.class.getDeclaredField("c"); - f_s = Target.class.getDeclaredField("s"); - f_j = Target.class.getDeclaredField("j"); - f_f = Target.class.getDeclaredField("f"); - f_d = Target.class.getDeclaredField("d"); - f_l = Target.class.getDeclaredField("l"); - f_annotated = Target.class.getDeclaredField("annotated"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - // int - public void setI() throws Exception { - f_i.set(t, 42); - } - - public void setIntI() throws Exception { - f_i.setInt(t, 45); - } - - public int getI() { - return t.i; - } - - public int getReflectI() throws Exception { - return f_i.getInt(t); - } - - public int getReflectObjectI() throws Exception { - return (Integer) f_i.get(t); - } - - // --- boolean - public void setZ() throws Exception { - f_z.setAccessible(true); - f_z.set(t, true); - } - - public void setIntZ() throws Exception { - f_z.setAccessible(true); - f_z.setBoolean(t, false); - } - - public boolean getZ() { - return t.z; - } - - public boolean getReflectZ() throws Exception { - return f_z.getBoolean(t); - } - - public boolean getReflectObjectZ() throws Exception { - return (Boolean) f_z.get(t); - } - - // --- byte - public void setB() throws Exception { - f_b.setAccessible(true); - f_b.set(t, (byte) 65); - } - - public void setIllegalB() throws Exception { - f_b.setAccessible(true); - f_b.set(t, 32); // cannot supply int - } - - public void setByteB() throws Exception { - f_b.setAccessible(true); - f_b.setByte(t, (byte) 70); - } - - public byte getB() { - return t.b; - } - - public byte getReflectB() throws Exception { - return f_b.getByte(t); - } - - public byte getReflectObjectB() throws Exception { - return (Byte) f_b.get(t); - } - - // --- char - public void setC() throws Exception { - f_c.setAccessible(true); - f_c.set(t, (char) 66); - } - - public void setIllegalC() throws Exception { - f_c.setAccessible(true); - f_c.set(t, 32); // cannot supply int - } - - public void setCharC() throws Exception { - f_c.setAccessible(true); - f_c.setChar(t, (char) 77); - } - - public char getC() { - return t.c; - } - - public char getReflectC() throws Exception { - return f_c.getChar(t); - } - - public char getReflectObjectC() throws Exception { - return (Character) f_c.get(t); - } - - // --- short - public void setS() throws Exception { - f_s.setAccessible(true); - f_s.set(t, (short) 660); - } - - public void setIllegalS() throws Exception { - f_s.setAccessible(true); - f_s.set(t, 32); // cannot supply int - } - - public void setShortS() throws Exception { - f_s.setAccessible(true); - f_s.setShort(t, (short) 77); - } - - public short getS() { - return t.s; - } - - public short getReflectS() throws Exception { - return f_s.getShort(t); - } - - public short getReflectObjectS() throws Exception { - return (Short) f_s.get(t); - } - - // --- long - public void setJ() throws Exception { - f_j.setAccessible(true); - f_j.set(t, (long) 660); - } - - public void setIllegalJ() throws Exception { - f_j.setAccessible(true); - f_j.set(t, 32); // cannot supply int - } - - public void setLongJ() throws Exception { - f_j.setAccessible(true); - f_j.setLong(t, (long) 77); - } - - public long getJ() { - return t.j; - } - - public long getReflectJ() throws Exception { - return f_j.getLong(t); - } - - public long getReflectObjectJ() throws Exception { - return (Long) f_j.get(t); - } - - // --- float - public void setF() throws Exception { - f_f.setAccessible(true); - f_f.set(t, (float) 660); - } - - public void setIllegalF() throws Exception { - f_f.setAccessible(true); - f_f.set(t, 32); // cannot supply int - } - - public void setFloatF() throws Exception { - f_f.setAccessible(true); - f_f.setFloat(t, (float) 77); - } - - public float getF() { - return t.f; - } - - public float getReflectF() throws Exception { - return f_f.getFloat(t); - } - - public float getReflectObjectF() throws Exception { - return (Float) f_f.get(t); - } - - // --- static int field - public void setIS() throws Exception { - f_is.setAccessible(true); - f_is.set(t, (int) 660); - } - - public void setIllegalIS() throws Exception { - f_is.setAccessible(true); - f_is.set(t, "abc"); // cannot supply int - } - - public void setintIS() throws Exception { - f_is.setAccessible(true); - f_is.setInt(t, (int) 77); - } - - public int getIS() { - return Target.is; - } - - public Integer getISInteger() { - return Target.is; - } - - public Integer getReflectIS() throws Exception { - return f_is.getInt(t); - } - - public Integer getReflectObjectIS() throws Exception { - return (Integer) f_is.get(t); - } - - // --- double - public void setD() throws Exception { - f_d.setAccessible(true); - f_d.set(t, (double) 660); - } - - public void setIllegalD() throws Exception { - f_d.setAccessible(true); - f_d.set(t, 32); // cannot supply int - } - - public void setDoubleD() throws Exception { - f_d.setAccessible(true); - f_d.setDouble(t, (double) 77); - } - - public double getD() { - return t.d; - } - - public double getReflectD() throws Exception { - return f_d.getDouble(t); - } - - public double getReflectObjectD() throws Exception { - return (Double) f_d.get(t); - } - - // --- boolean array - public void setZArray() throws Exception { - f_zarray.setAccessible(true); - boolean[] bs = new boolean[] { true, false, true }; - f_zarray.set(t, bs); - } - - public void setIllegalZArray() throws Exception { - f_zarray.setAccessible(true); - f_zarray.set(t, 32); // cannot supply int - } - - public boolean[] getZArray() { - return t.zs; - } - - public boolean[] getReflectObjectZArray() throws Exception { - return (boolean[]) f_zarray.get(t); - } - - // --- reference - public void setReference() throws Exception { - f_l.setAccessible(true); - f_l.set(t, "abcde"); - } - - public void setIllegalReference() throws Exception { - f_l.setAccessible(true); - f_l.set(t, 32); // cannot supply int - } - - public String getReference() { - return t.l; - } - - public String getReflectObjectReference() throws Exception { - return (String) f_l.get(t); - } - - // --- - - public Annotation getAnnotation(Class clazz) { - return (Annotation) f_annotated.getAnnotation(clazz); - } - - public Annotation[] getDeclaredAnnotations() { - return (Annotation[]) f_annotated.getDeclaredAnnotations(); - } - -} +package reflection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; + +public class Invoker { + + static Field f_i; // int + static Field f_z; // boolean + static Field f_zarray; // boolean[] + static Field f_is; // static int + static Field f_b; // byte + static Field f_c; // char + static Field f_s; // short + static Field f_j; // long + static Field f_f; // float + static Field f_d; // double + static Field f_l; // reference (String) + static Field f_annotated; // annotated field + static Target t = new Target(); + + { + try { + f_i = Target.class.getDeclaredField("i"); + f_z = Target.class.getDeclaredField("z"); + f_zarray = Target.class.getDeclaredField("zs"); + f_is = Target.class.getDeclaredField("is"); + f_b = Target.class.getDeclaredField("b"); + f_c = Target.class.getDeclaredField("c"); + f_s = Target.class.getDeclaredField("s"); + f_j = Target.class.getDeclaredField("j"); + f_f = Target.class.getDeclaredField("f"); + f_d = Target.class.getDeclaredField("d"); + f_l = Target.class.getDeclaredField("l"); + f_annotated = Target.class.getDeclaredField("annotated"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + // int + public void setI() throws Exception { + f_i.set(t, 42); + } + + public void setIntI() throws Exception { + f_i.setInt(t, 45); + } + + public int getI() { + return t.i; + } + + public int getReflectI() throws Exception { + return f_i.getInt(t); + } + + public int getReflectObjectI() throws Exception { + return (Integer) f_i.get(t); + } + + // --- boolean + public void setZ() throws Exception { + f_z.setAccessible(true); + f_z.set(t, true); + } + + public void setIntZ() throws Exception { + f_z.setAccessible(true); + f_z.setBoolean(t, false); + } + + public boolean getZ() { + return t.z; + } + + public boolean getReflectZ() throws Exception { + return f_z.getBoolean(t); + } + + public boolean getReflectObjectZ() throws Exception { + return (Boolean) f_z.get(t); + } + + // --- byte + public void setB() throws Exception { + f_b.setAccessible(true); + f_b.set(t, (byte) 65); + } + + public void setIllegalB() throws Exception { + f_b.setAccessible(true); + f_b.set(t, 32); // cannot supply int + } + + public void setByteB() throws Exception { + f_b.setAccessible(true); + f_b.setByte(t, (byte) 70); + } + + public byte getB() { + return t.b; + } + + public byte getReflectB() throws Exception { + return f_b.getByte(t); + } + + public byte getReflectObjectB() throws Exception { + return (Byte) f_b.get(t); + } + + // --- char + public void setC() throws Exception { + f_c.setAccessible(true); + f_c.set(t, (char) 66); + } + + public void setIllegalC() throws Exception { + f_c.setAccessible(true); + f_c.set(t, 32); // cannot supply int + } + + public void setCharC() throws Exception { + f_c.setAccessible(true); + f_c.setChar(t, (char) 77); + } + + public char getC() { + return t.c; + } + + public char getReflectC() throws Exception { + return f_c.getChar(t); + } + + public char getReflectObjectC() throws Exception { + return (Character) f_c.get(t); + } + + // --- short + public void setS() throws Exception { + f_s.setAccessible(true); + f_s.set(t, (short) 660); + } + + public void setIllegalS() throws Exception { + f_s.setAccessible(true); + f_s.set(t, 32); // cannot supply int + } + + public void setShortS() throws Exception { + f_s.setAccessible(true); + f_s.setShort(t, (short) 77); + } + + public short getS() { + return t.s; + } + + public short getReflectS() throws Exception { + return f_s.getShort(t); + } + + public short getReflectObjectS() throws Exception { + return (Short) f_s.get(t); + } + + // --- long + public void setJ() throws Exception { + f_j.setAccessible(true); + f_j.set(t, (long) 660); + } + + public void setIllegalJ() throws Exception { + f_j.setAccessible(true); + f_j.set(t, 32); // cannot supply int + } + + public void setLongJ() throws Exception { + f_j.setAccessible(true); + f_j.setLong(t, (long) 77); + } + + public long getJ() { + return t.j; + } + + public long getReflectJ() throws Exception { + return f_j.getLong(t); + } + + public long getReflectObjectJ() throws Exception { + return (Long) f_j.get(t); + } + + // --- float + public void setF() throws Exception { + f_f.setAccessible(true); + f_f.set(t, (float) 660); + } + + public void setIllegalF() throws Exception { + f_f.setAccessible(true); + f_f.set(t, 32); // cannot supply int + } + + public void setFloatF() throws Exception { + f_f.setAccessible(true); + f_f.setFloat(t, (float) 77); + } + + public float getF() { + return t.f; + } + + public float getReflectF() throws Exception { + return f_f.getFloat(t); + } + + public float getReflectObjectF() throws Exception { + return (Float) f_f.get(t); + } + + // --- static int field + public void setIS() throws Exception { + f_is.setAccessible(true); + f_is.set(t, (int) 660); + } + + public void setIllegalIS() throws Exception { + f_is.setAccessible(true); + f_is.set(t, "abc"); // cannot supply int + } + + public void setintIS() throws Exception { + f_is.setAccessible(true); + f_is.setInt(t, (int) 77); + } + + public int getIS() { + return Target.is; + } + + public Integer getISInteger() { + return Target.is; + } + + public Integer getReflectIS() throws Exception { + return f_is.getInt(t); + } + + public Integer getReflectObjectIS() throws Exception { + return (Integer) f_is.get(t); + } + + // --- double + public void setD() throws Exception { + f_d.setAccessible(true); + f_d.set(t, (double) 660); + } + + public void setIllegalD() throws Exception { + f_d.setAccessible(true); + f_d.set(t, 32); // cannot supply int + } + + public void setDoubleD() throws Exception { + f_d.setAccessible(true); + f_d.setDouble(t, (double) 77); + } + + public double getD() { + return t.d; + } + + public double getReflectD() throws Exception { + return f_d.getDouble(t); + } + + public double getReflectObjectD() throws Exception { + return (Double) f_d.get(t); + } + + // --- boolean array + public void setZArray() throws Exception { + f_zarray.setAccessible(true); + boolean[] bs = new boolean[] { true, false, true }; + f_zarray.set(t, bs); + } + + public void setIllegalZArray() throws Exception { + f_zarray.setAccessible(true); + f_zarray.set(t, 32); // cannot supply int + } + + public boolean[] getZArray() { + return t.zs; + } + + public boolean[] getReflectObjectZArray() throws Exception { + return (boolean[]) f_zarray.get(t); + } + + // --- reference + public void setReference() throws Exception { + f_l.setAccessible(true); + f_l.set(t, "abcde"); + } + + public void setIllegalReference() throws Exception { + f_l.setAccessible(true); + f_l.set(t, 32); // cannot supply int + } + + public String getReference() { + return t.l; + } + + public String getReflectObjectReference() throws Exception { + return (String) f_l.get(t); + } + + // --- + + public Annotation getAnnotation(Class clazz) { + return (Annotation) f_annotated.getAnnotation(clazz); + } + + public Annotation[] getDeclaredAnnotations() { + return (Annotation[]) f_annotated.getDeclaredAnnotations(); + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/Invoker2.java b/org.springsource.loaded.testdata/src/main/java/reflection/Invoker2.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/Invoker2.java rename to org.springsource.loaded.testdata/src/main/java/reflection/Invoker2.java index 9bad5be..2127bc5 100644 --- a/org.springsource.loaded.testdata/src/reflection/Invoker2.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/Invoker2.java @@ -1,32 +1,32 @@ -package reflection; - -import java.lang.reflect.Field; - -public class Invoker2 { - - static Field f_zarray; // boolean[] - static Field f_f; // float - static Field f_d; // double - static Field f_l; // reference (String) - static Field f_annotated; // annotated field - static Target2 t = new Target2(); - - { - try { - f_zarray = Target2.class.getDeclaredField("zs"); - f_f = Target2.class.getDeclaredField("f"); - f_d = Target2.class.getDeclaredField("d"); - f_l = Target2.class.getDeclaredField("l"); - f_annotated = Target2.class.getDeclaredField("annotated"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public String setString() throws Exception { - f_l.setAccessible(true); - f_l.set(t, "wibble"); - return (String) f_l.get(t); - } - -} +package reflection; + +import java.lang.reflect.Field; + +public class Invoker2 { + + static Field f_zarray; // boolean[] + static Field f_f; // float + static Field f_d; // double + static Field f_l; // reference (String) + static Field f_annotated; // annotated field + static Target2 t = new Target2(); + + { + try { + f_zarray = Target2.class.getDeclaredField("zs"); + f_f = Target2.class.getDeclaredField("f"); + f_d = Target2.class.getDeclaredField("d"); + f_l = Target2.class.getDeclaredField("l"); + f_annotated = Target2.class.getDeclaredField("annotated"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public String setString() throws Exception { + f_l.setAccessible(true); + f_l.set(t, "wibble"); + return (String) f_l.get(t); + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/MethodInvoker.java b/org.springsource.loaded.testdata/src/main/java/reflection/MethodInvoker.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/MethodInvoker.java rename to org.springsource.loaded.testdata/src/main/java/reflection/MethodInvoker.java diff --git a/org.springsource.loaded.testdata/src/reflection/MethodTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget.java similarity index 93% rename from org.springsource.loaded.testdata/src/reflection/MethodTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget.java index 8d8acf0..583ac83 100644 --- a/org.springsource.loaded.testdata/src/reflection/MethodTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget.java @@ -1,21 +1,21 @@ -package reflection; - -public class MethodTarget { - - public int methodOne() { - return 35; - } - - @AnnoT - public void methodAnnotated() { - } - - @AnnoT - public void methodAnnotated2() { - } - - public void methodAnnotated3(@AnnoT String s, @AnnoT2 int i, @AnnoT @AnnoT2 float f) { - - } - -} +package reflection; + +public class MethodTarget { + + public int methodOne() { + return 35; + } + + @AnnoT + public void methodAnnotated() { + } + + @AnnoT + public void methodAnnotated2() { + } + + public void methodAnnotated3(@AnnoT String s, @AnnoT2 int i, @AnnoT @AnnoT2 float f) { + + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/MethodTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget002.java similarity index 93% rename from org.springsource.loaded.testdata/src/reflection/MethodTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget002.java index afbe514..55555e9 100644 --- a/org.springsource.loaded.testdata/src/reflection/MethodTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/MethodTarget002.java @@ -1,27 +1,27 @@ -package reflection; - -public class MethodTarget002 { - - public int methodOne() { - return 37; - } - - public int lateMethod() { - return 42; - } - - @AnnoT2 - @AnnoT - public void methodAnnotated() { - - } - - @AnnoT2 - public void methodAnnotated2() { - } - - // changed, deleted, reordered - public void methodAnnotated3(@AnnoT2 String s, int i, @AnnoT2 @AnnoT float f) { - } - -} +package reflection; + +public class MethodTarget002 { + + public int methodOne() { + return 37; + } + + public int lateMethod() { + return 42; + } + + @AnnoT2 + @AnnoT + public void methodAnnotated() { + + } + + @AnnoT2 + public void methodAnnotated2() { + } + + // changed, deleted, reordered + public void methodAnnotated3(@AnnoT2 String s, int i, @AnnoT2 @AnnoT float f) { + } + +} diff --git a/org.springsource.loaded.testdata/src/reflection/NonReloadableSuperClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/NonReloadableSuperClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/NonReloadableSuperClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/NonReloadableSuperClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/SubTestVal.java b/org.springsource.loaded.testdata/src/main/java/reflection/SubTestVal.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/SubTestVal.java rename to org.springsource.loaded.testdata/src/main/java/reflection/SubTestVal.java diff --git a/org.springsource.loaded.testdata/src/reflection/Target.class b/org.springsource.loaded.testdata/src/main/java/reflection/Target.class similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/Target.class rename to org.springsource.loaded.testdata/src/main/java/reflection/Target.class diff --git a/org.springsource.loaded.testdata/src/reflection/Target.java b/org.springsource.loaded.testdata/src/main/java/reflection/Target.java similarity index 93% rename from org.springsource.loaded.testdata/src/reflection/Target.java rename to org.springsource.loaded.testdata/src/main/java/reflection/Target.java index 6c7fe2f..828c00a 100644 --- a/org.springsource.loaded.testdata/src/reflection/Target.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/Target.java @@ -1,20 +1,20 @@ -package reflection; - -public class Target { - - // public String s; - public int i; - public boolean[] zs; - public static Integer is; - boolean z; - byte b; - public short s; - char c; - public long j; - public float f; - double d; - public String l; - - @AnnoT - public String annotated; -} +package reflection; + +public class Target { + + // public String s; + public int i; + public boolean[] zs; + public static Integer is; + boolean z; + byte b; + public short s; + char c; + public long j; + public float f; + double d; + public String l; + + @AnnoT + public String annotated; +} diff --git a/org.springsource.loaded.testdata/src/reflection/Target002.java b/org.springsource.loaded.testdata/src/main/java/reflection/Target002.java similarity index 93% rename from org.springsource.loaded.testdata/src/reflection/Target002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/Target002.java index 4cee975..62377e5 100644 --- a/org.springsource.loaded.testdata/src/reflection/Target002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/Target002.java @@ -1,19 +1,19 @@ -package reflection; - -public class Target002 { - - // public String s; - public int i; - public boolean[] zs; - public Integer[] is; - boolean z; - byte b; - public short s; - char c; - public long j; - public float f; - double d; - - @AnnoT2 - public String annotated; -} +package reflection; + +public class Target002 { + + // public String s; + public int i; + public boolean[] zs; + public Integer[] is; + boolean z; + byte b; + public short s; + char c; + public long j; + public float f; + double d; + + @AnnoT2 + public String annotated; +} diff --git a/org.springsource.loaded.testdata/src/reflection/Target2.java b/org.springsource.loaded.testdata/src/main/java/reflection/Target2.java similarity index 93% rename from org.springsource.loaded.testdata/src/reflection/Target2.java rename to org.springsource.loaded.testdata/src/main/java/reflection/Target2.java index 9b49c92..31369c3 100644 --- a/org.springsource.loaded.testdata/src/reflection/Target2.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/Target2.java @@ -1,20 +1,20 @@ -package reflection; - -public class Target2 { - - // public String s; - public int i; - public boolean[] zs; - public static Integer is; - boolean z; - byte b; - public short s; - char c; - public long j; - public float f; - double d; - public String l; - - @AnnoT - public String annotated; -} +package reflection; + +public class Target2 { + + // public String s; + public int i; + public boolean[] zs; + public static Integer is; + boolean z; + byte b; + public short s; + char c; + public long j; + public float f; + double d; + public String l; + + @AnnoT + public String annotated; +} diff --git a/org.springsource.loaded.testdata/src/reflection/TestVal.java b/org.springsource.loaded.testdata/src/main/java/reflection/TestVal.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/TestVal.java rename to org.springsource.loaded.testdata/src/main/java/reflection/TestVal.java diff --git a/org.springsource.loaded.testdata/src/reflection/bridgemethods/ClassWithBridgeMethod.java b/org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/bridgemethods/ClassWithBridgeMethod.java rename to org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod.java diff --git a/org.springsource.loaded.testdata/src/reflection/bridgemethods/ClassWithBridgeMethod002.java b/org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/bridgemethods/ClassWithBridgeMethod002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/bridgemethods/ClassWithBridgeMethod002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/ClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/ClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/InterfaceTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/InterfaceTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/SubClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/SubInterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/SubInterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/classannotations/SubInterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classannotations/SubInterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classannotations/SubInterfaceTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/classmodifiers/ClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/classmodifiers/ClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance002.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance002.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance003.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance003.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance004.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassForNewInstance004.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassForNewInstance004.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassWithAnnotatedConstructors.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassWithAnnotatedConstructors.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassWithAnnotatedConstructors002.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassWithAnnotatedConstructors002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithAnnotatedConstructors002.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassWithConstructors.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassWithConstructors.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors.java diff --git a/org.springsource.loaded.testdata/src/reflection/constructors/ClassWithConstructors002.java b/org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/constructors/ClassWithConstructors002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/constructors/ClassWithConstructors002.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/ClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/ClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fieldannotations/InterfaceTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fieldannotations/InterfaceTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/fields/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget.java similarity index 97% rename from org.springsource.loaded.testdata/src/reflection/fields/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget.java index 388c574..b5e3cea 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/ClassTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget.java @@ -1,22 +1,22 @@ -package reflection.fields; - -import reflection.nonrelfields.NonReloadableClassWithFields; - -@SuppressWarnings("unused") -public class ClassTarget extends NonReloadableClassWithFields implements InterfaceTarget { - - public int myField = 999; - public static String myStaticField = "staticField"; - private boolean myPrivateField = true; - - public int myDeletedField = 100; - private String myDeletedPrivateField = "ClassTarget.myDeletedPrivateField"; - static String myDeletedStaticField = "ClassTarget.myDeletedStaticField"; - - public int myChangedField = 101; - private int myChangedPrivateField = 102; - static int myChangedStaticField = 103; - private int madePublicField = 103; - public String madeStaticField = "notStaticYet"; - +package reflection.fields; + +import reflection.nonrelfields.NonReloadableClassWithFields; + +@SuppressWarnings("unused") +public class ClassTarget extends NonReloadableClassWithFields implements InterfaceTarget { + + public int myField = 999; + public static String myStaticField = "staticField"; + private boolean myPrivateField = true; + + public int myDeletedField = 100; + private String myDeletedPrivateField = "ClassTarget.myDeletedPrivateField"; + static String myDeletedStaticField = "ClassTarget.myDeletedStaticField"; + + public int myChangedField = 101; + private int myChangedPrivateField = 102; + static int myChangedStaticField = 103; + private int madePublicField = 103; + public String madeStaticField = "notStaticYet"; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget002.java similarity index 97% rename from org.springsource.loaded.testdata/src/reflection/fields/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget002.java index 5665e6c..a48b4d4 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/ClassTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/ClassTarget002.java @@ -1,22 +1,22 @@ -package reflection.fields; - -import reflection.nonrelfields.NonReloadableClassWithFields; - -@SuppressWarnings("unused") -public class ClassTarget002 extends NonReloadableClassWithFields implements InterfaceTarget { - - public int myField = 666; - public static String myStaticField = "staticField"; - private boolean myPrivateField = false; - - public String myChangedField = "201"; - private String myChangedPrivateField= "202"; // in ClassTarget was: private int myChangedPrivateField = 102; - static String myChangedStaticField;// = "203"; static int myChangedStaticField = 103; - - public String myNewField = "201"; - private String myNewPrivateField = "202"; - static String myNewStaticField;// = "203"; - public int madePublicField = 9103; - public static String madeStaticField;// = "nowStatic"; - -} +package reflection.fields; + +import reflection.nonrelfields.NonReloadableClassWithFields; + +@SuppressWarnings("unused") +public class ClassTarget002 extends NonReloadableClassWithFields implements InterfaceTarget { + + public int myField = 666; + public static String myStaticField = "staticField"; + private boolean myPrivateField = false; + + public String myChangedField = "201"; + private String myChangedPrivateField= "202"; // in ClassTarget was: private int myChangedPrivateField = 102; + static String myChangedStaticField;// = "203"; static int myChangedStaticField = 103; + + public String myNewField = "201"; + private String myNewPrivateField = "202"; + static String myNewStaticField;// = "203"; + public int madePublicField = 9103; + public static String madeStaticField;// = "nowStatic"; + +} diff --git a/org.springsource.loaded.testdata/src/reflection/fields/FieldSetAccessTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fields/FieldSetAccessTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/fields/FieldSetAccessTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fields/FieldSetAccessTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/FieldSetAccessTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget.java index b66178f..4194159 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget.java @@ -1,11 +1,11 @@ -package reflection.fields; - -public interface InterfaceTarget { - - //TODO: currently we do not have tests that focus directly on interfaces and fields. - - int iField = 999; - int iDeletedField = 100; - int iChangedField = 101; - +package reflection.fields; + +public interface InterfaceTarget { + + //TODO: currently we do not have tests that focus directly on interfaces and fields. + + int iField = 999; + int iDeletedField = 100; + int iChangedField = 101; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget002.java similarity index 94% rename from org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget002.java index 84d9da2..7d9a6a0 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/InterfaceTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/InterfaceTarget002.java @@ -1,10 +1,10 @@ -package reflection.fields; - -public interface InterfaceTarget002 { - - int iField = 666; - String iChangedField = "changedField"; - - String iAddedField = "newField"; - +package reflection.fields; + +public interface InterfaceTarget002 { + + int iField = 666; + String iChangedField = "changedField"; + + String iAddedField = "newField"; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget.java similarity index 94% rename from org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget.java index ef26ee7..6345b72 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget.java @@ -1,8 +1,8 @@ -package reflection.fields; - -public interface S1InterfaceTarget extends InterfaceTarget { - - int iField = 1; - int i1Field = 2; - +package reflection.fields; + +public interface S1InterfaceTarget extends InterfaceTarget { + + int iField = 1; + int i1Field = 2; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java index 6832a3f..80081a6 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/S1InterfaceTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S1InterfaceTarget002.java @@ -1,8 +1,8 @@ -package reflection.fields; - -public interface S1InterfaceTarget002 extends InterfaceTarget { - - int iField = 1; - int i1AddedField = 201; - +package reflection.fields; + +public interface S1InterfaceTarget002 extends InterfaceTarget { + + int iField = 1; + int i1AddedField = 201; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget.java index a60aea4..21deb42 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget.java @@ -1,7 +1,7 @@ -package reflection.fields; - -public interface S2InterfaceTarget extends InterfaceTarget, S1InterfaceTarget { - - int i2Field = 2222; - +package reflection.fields; + +public interface S2InterfaceTarget extends InterfaceTarget, S1InterfaceTarget { + + int i2Field = 2222; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java index 38ffc16..4400513 100644 --- a/org.springsource.loaded.testdata/src/reflection/fields/S2InterfaceTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/fields/S2InterfaceTarget002.java @@ -1,8 +1,8 @@ -package reflection.fields; - -public interface S2InterfaceTarget002 extends InterfaceTarget, S1InterfaceTarget { - - int i2Field = 222; - int i2Added = 202; - +package reflection.fields; + +public interface S2InterfaceTarget002 extends InterfaceTarget, S1InterfaceTarget { + + int i2Field = 222; + int i2Added = 202; + } \ No newline at end of file diff --git a/org.springsource.loaded.testdata/src/reflection/fields/SubClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fields/SubClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/fields/SubClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/fields/SubClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/fields/SubClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/generics/GenericClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/generics/GenericClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/generics/GenericClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/generics/GenericClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/generics/GenericInterface.java b/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/generics/GenericInterface.java rename to org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface.java diff --git a/org.springsource.loaded.testdata/src/reflection/generics/GenericInterface002.java b/org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/generics/GenericInterface002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/generics/GenericInterface002.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/A.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/A.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/A.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/A002.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/A002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/A002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/A002.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/B.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/B.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/B.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/B002.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/B002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/B002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/B002.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/C.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/C.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/C.java diff --git a/org.springsource.loaded.testdata/src/reflection/invocation/C002.java b/org.springsource.loaded.testdata/src/main/java/reflection/invocation/C002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/invocation/C002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/invocation/C002.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/InterfaceTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/InterfaceTarget003.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotInterface.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotInterface.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface.java diff --git a/org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotInterface002.java b/org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/methodannotations/ParamAnnotInterface002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/methodannotations/ParamAnnotInterface002.java diff --git a/org.springsource.loaded.testdata/src/reflection/nonrelfields/NonReloadableClassWithFields.java b/org.springsource.loaded.testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/nonrelfields/NonReloadableClassWithFields.java rename to org.springsource.loaded.testdata/src/main/java/reflection/nonrelfields/NonReloadableClassWithFields.java diff --git a/org.springsource.loaded.testdata/src/reflection/reflection/Invoker.class b/org.springsource.loaded.testdata/src/main/java/reflection/reflection/Invoker.class similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/reflection/Invoker.class rename to org.springsource.loaded.testdata/src/main/java/reflection/reflection/Invoker.class diff --git a/org.springsource.loaded.testdata/src/reflection/reflection/Target.class b/org.springsource.loaded.testdata/src/main/java/reflection/reflection/Target.class similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/reflection/Target.class rename to org.springsource.loaded.testdata/src/main/java/reflection/reflection/Target.class diff --git a/org.springsource.loaded.testdata/src/reflection/targets/ChangeModClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/ChangeModClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/ChangeModClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/ChangeModClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/ChangeModClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget.java similarity index 95% rename from org.springsource.loaded.testdata/src/reflection/targets/ClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget.java index df95591..9eab150 100644 --- a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget.java @@ -1,95 +1,95 @@ -package reflection.targets; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import reflection.AnnoT; - -@AnnoT -public class ClassTarget { - - public int myField = 999; - public static String myStaticField = "staticField"; - @SuppressWarnings("unused") - private boolean myPrivateField = true; - - public ClassTarget() { - - } - - public ClassTarget(float f) { // position on line20 important, must match in ClassTarget002 - System.out.println(f); - } - - public int methodStays() { - return 99; - } - - public int methodDeleted() { - return 37; - } - - public int methodChanged() { - return 1; - } - - public String changeIt(String it) { - return it + "ho!"; - } - - public String changeReturn(String it) { - return it + "ho!"; - } - - public String changeThem(String it, int add) { - return it + add; - } - - public String deleteThem(String it, int add) { - return it + add; - } - - public String callPrivateMethod() throws Exception { - Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); - return (String) privateOne.invoke(this); - } - - @SuppressWarnings("unused") - private String privateMethod() { - return "privateMethod result"; - } - - protected String protectedMethod() { - return "protectedMethod result"; - } - - String defaultMethod() { - return "defaultMethod result"; - } - - public String overrideMethod() { - return "ClassTarget.overrideMethod"; - } - - public String overrideMethodDeleted() { - return "ClassTarget.overrideMethodDeleted"; - } - - public static String staticMethod() { - return "ClassTarget.staticMethod"; - } - - public int callPublicMethodOnDefaultClass() throws SecurityException, NoSuchMethodException, IllegalArgumentException, - IllegalAccessException, InvocationTargetException { - Method publicOne = DefaultClass.class.getDeclaredMethod("publicMethod"); - return (Integer) publicOne.invoke(new DefaultClass()); - } - - /** - * This main method is just here to have some place to put 'test' code so we can try what *should* happen when we run this - * normally without springloaded. - */ - public static void main(String[] args) throws Exception { - System.out.println(new ClassTarget().callPrivateMethod()); //Works!!! - } -} +package reflection.targets; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import reflection.AnnoT; + +@AnnoT +public class ClassTarget { + + public int myField = 999; + public static String myStaticField = "staticField"; + @SuppressWarnings("unused") + private boolean myPrivateField = true; + + public ClassTarget() { + + } + + public ClassTarget(float f) { // position on line20 important, must match in ClassTarget002 + System.out.println(f); + } + + public int methodStays() { + return 99; + } + + public int methodDeleted() { + return 37; + } + + public int methodChanged() { + return 1; + } + + public String changeIt(String it) { + return it + "ho!"; + } + + public String changeReturn(String it) { + return it + "ho!"; + } + + public String changeThem(String it, int add) { + return it + add; + } + + public String deleteThem(String it, int add) { + return it + add; + } + + public String callPrivateMethod() throws Exception { + Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); + return (String) privateOne.invoke(this); + } + + @SuppressWarnings("unused") + private String privateMethod() { + return "privateMethod result"; + } + + protected String protectedMethod() { + return "protectedMethod result"; + } + + String defaultMethod() { + return "defaultMethod result"; + } + + public String overrideMethod() { + return "ClassTarget.overrideMethod"; + } + + public String overrideMethodDeleted() { + return "ClassTarget.overrideMethodDeleted"; + } + + public static String staticMethod() { + return "ClassTarget.staticMethod"; + } + + public int callPublicMethodOnDefaultClass() throws SecurityException, NoSuchMethodException, IllegalArgumentException, + IllegalAccessException, InvocationTargetException { + Method publicOne = DefaultClass.class.getDeclaredMethod("publicMethod"); + return (Integer) publicOne.invoke(new DefaultClass()); + } + + /** + * This main method is just here to have some place to put 'test' code so we can try what *should* happen when we run this + * normally without springloaded. + */ + public static void main(String[] args) throws Exception { + System.out.println(new ClassTarget().callPrivateMethod()); //Works!!! + } +} diff --git a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget002.java similarity index 94% rename from org.springsource.loaded.testdata/src/reflection/targets/ClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget002.java index 5d4e155..8de2084 100644 --- a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget002.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget002.java @@ -1,94 +1,94 @@ -package reflection.targets; - -import java.lang.reflect.Method; - -import reflection.AnnoT; -import reflection.AnnoT2; -import reflection.AnnoT3; - -@AnnoT2 -public class ClassTarget002 { - public int myField = 999; - public static String myStaticField = "staticField"; - @SuppressWarnings("unused") - private boolean myPrivateField = true; - - @AnnoT - public ClassTarget002() { - } - - public ClassTarget002(float f) { - System.out.println(f); - } - - @AnnoT3("can'tchange") - public ClassTarget002(int f) { - myField = f; - } - - public int methodStays() { - return 99; - } - - public int methodChanged() { - return 2; - } - - public int lateMethod() { - return 42; - } - - public String doubleIt(String it) { - return it + it; - } - - public String changeIt(String it) { - return it + " " + it + "!"; - } - - public int changeReturn(String it) { - return it.length(); - } - - public String changeThem(String it, int repeat) { - String result = ""; - for (int i = 0; i < repeat; i++) { - result += it; - } - return result; - } - - public String callPrivateMethod() throws Exception { - Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); - return (String) privateOne.invoke(this); - } - - @SuppressWarnings("unused") - private String privateMethod() { - return "new privateMethod result"; - } - - protected String protectedMethod() { - return "new protectedMethod result"; - } - - public String overrideMethod() { - return "ClassTarget002.overrideMethod"; - } - - String defaultMethod() { - return "new defaultMethod result"; - } - - public static String staticMethod() { - return "ClassTarget002.staticMethod"; - } - - public static int staticMethodAdded() { - return 2; - } - - public static String staticMethodAddedWithArgs(int i, String s) { - return i + s + "002"; - } -} +package reflection.targets; + +import java.lang.reflect.Method; + +import reflection.AnnoT; +import reflection.AnnoT2; +import reflection.AnnoT3; + +@AnnoT2 +public class ClassTarget002 { + public int myField = 999; + public static String myStaticField = "staticField"; + @SuppressWarnings("unused") + private boolean myPrivateField = true; + + @AnnoT + public ClassTarget002() { + } + + public ClassTarget002(float f) { + System.out.println(f); + } + + @AnnoT3("can'tchange") + public ClassTarget002(int f) { + myField = f; + } + + public int methodStays() { + return 99; + } + + public int methodChanged() { + return 2; + } + + public int lateMethod() { + return 42; + } + + public String doubleIt(String it) { + return it + it; + } + + public String changeIt(String it) { + return it + " " + it + "!"; + } + + public int changeReturn(String it) { + return it.length(); + } + + public String changeThem(String it, int repeat) { + String result = ""; + for (int i = 0; i < repeat; i++) { + result += it; + } + return result; + } + + public String callPrivateMethod() throws Exception { + Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); + return (String) privateOne.invoke(this); + } + + @SuppressWarnings("unused") + private String privateMethod() { + return "new privateMethod result"; + } + + protected String protectedMethod() { + return "new protectedMethod result"; + } + + public String overrideMethod() { + return "ClassTarget002.overrideMethod"; + } + + String defaultMethod() { + return "new defaultMethod result"; + } + + public static String staticMethod() { + return "ClassTarget002.staticMethod"; + } + + public static int staticMethodAdded() { + return 2; + } + + public static String staticMethodAddedWithArgs(int i, String s) { + return i + s + "002"; + } +} diff --git a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget003.java similarity index 94% rename from org.springsource.loaded.testdata/src/reflection/targets/ClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget003.java index 2c1a60a..163ca94 100644 --- a/org.springsource.loaded.testdata/src/reflection/targets/ClassTarget003.java +++ b/org.springsource.loaded.testdata/src/main/java/reflection/targets/ClassTarget003.java @@ -1,87 +1,87 @@ -package reflection.targets; - -import java.lang.reflect.Method; - -import reflection.AnnoT; -import reflection.AnnoT2; -import reflection.AnnoT3; - -@AnnoT2 -public class ClassTarget003 { - - @AnnoT2 - int myField = 10; - - @AnnoT - public ClassTarget003() { - } - - @AnnoT3("can'tchange") - public ClassTarget003(int f) { - myField = f; - System.out.println("modified!"); - } - - public int methodStays() { - return 99; - } - - public int methodChanged() { - return 3; //Changed from v002 - } - - public int lateMethod() { - return 42; - } - - public String doubleIt(String it) { - return it + it; - } - - public String changeIt(String it) { - return it + " " + it + "!"; - } - - public int changeReturn(String it) { - return it.length(); - } - - public String changeThem(String it, int repeat) { - String result = ""; - for (int i = 0; i < repeat; i++) { - result += it; - } - return result; - } - - public String callPrivateMethod() throws Exception { - Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); - return (String) privateOne.invoke(this); - } - - @SuppressWarnings("unused") - private String privateMethod() { - return "new privateMethod result"; - } - - protected String protectedMethod() { - return "new protectedMethod result"; - } - - String defaultMethod() { - return "new defaultMethod result"; - } - - public static int staticMethodAdded() { - return 3; - } - - public static String staticMethodAddedWithArgs(int i, String s) { - return i + s + "003"; - } - - @Override - public String toString() { - return "ClassTarget003.toString"; - } -} +package reflection.targets; + +import java.lang.reflect.Method; + +import reflection.AnnoT; +import reflection.AnnoT2; +import reflection.AnnoT3; + +@AnnoT2 +public class ClassTarget003 { + + @AnnoT2 + int myField = 10; + + @AnnoT + public ClassTarget003() { + } + + @AnnoT3("can'tchange") + public ClassTarget003(int f) { + myField = f; + System.out.println("modified!"); + } + + public int methodStays() { + return 99; + } + + public int methodChanged() { + return 3; //Changed from v002 + } + + public int lateMethod() { + return 42; + } + + public String doubleIt(String it) { + return it + it; + } + + public String changeIt(String it) { + return it + " " + it + "!"; + } + + public int changeReturn(String it) { + return it.length(); + } + + public String changeThem(String it, int repeat) { + String result = ""; + for (int i = 0; i < repeat; i++) { + result += it; + } + return result; + } + + public String callPrivateMethod() throws Exception { + Method privateOne = ClassTarget.class.getDeclaredMethod("privateMethod"); + return (String) privateOne.invoke(this); + } + + @SuppressWarnings("unused") + private String privateMethod() { + return "new privateMethod result"; + } + + protected String protectedMethod() { + return "new protectedMethod result"; + } + + String defaultMethod() { + return "new defaultMethod result"; + } + + public static int staticMethodAdded() { + return 3; + } + + public static String staticMethodAddedWithArgs(int i, String s) { + return i + s + "003"; + } + + @Override + public String toString() { + return "ClassTarget003.toString"; + } +} diff --git a/org.springsource.loaded.testdata/src/reflection/targets/DefaultClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/DefaultClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/DefaultClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/DefaultClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/DefaultClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodInterface.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodInterface.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodInterface002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodInterface002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodInterface002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubInterface.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubInterface.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubInterface002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/GetMethodSubInterface002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/GetMethodSubInterface002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/InterfaceTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/InterfaceTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/InterfaceTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/InterfaceTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/InterfaceTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/MyFrame.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/MyFrame.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/MyFrame002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/MyFrame002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/MyFrame002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SimpleClass.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SimpleClass.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SimpleClass002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SimpleClass002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SimpleClass002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SubClassImplementsInterface.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SubClassImplementsInterface.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SubClassImplementsInterface002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SubClassImplementsInterface002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassImplementsInterface002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget002.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget002.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget002.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget002.java diff --git a/org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget003.java b/org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget003.java similarity index 100% rename from org.springsource.loaded.testdata/src/reflection/targets/SubClassTarget003.java rename to org.springsource.loaded.testdata/src/main/java/reflection/targets/SubClassTarget003.java diff --git a/org.springsource.loaded.testdata/src/remote/One.java b/org.springsource.loaded.testdata/src/main/java/remote/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/remote/One.java rename to org.springsource.loaded.testdata/src/main/java/remote/One.java diff --git a/org.springsource.loaded.testdata/src/remote/One2.java b/org.springsource.loaded.testdata/src/main/java/remote/One2.java similarity index 100% rename from org.springsource.loaded.testdata/src/remote/One2.java rename to org.springsource.loaded.testdata/src/main/java/remote/One2.java diff --git a/org.springsource.loaded.testdata/src/sfields/A.java b/org.springsource.loaded.testdata/src/main/java/sfields/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/A.java rename to org.springsource.loaded.testdata/src/main/java/sfields/A.java diff --git a/org.springsource.loaded.testdata/src/sfields/B.java b/org.springsource.loaded.testdata/src/main/java/sfields/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/B.java rename to org.springsource.loaded.testdata/src/main/java/sfields/B.java diff --git a/org.springsource.loaded.testdata/src/sfields/C.java b/org.springsource.loaded.testdata/src/main/java/sfields/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/C.java rename to org.springsource.loaded.testdata/src/main/java/sfields/C.java diff --git a/org.springsource.loaded.testdata/src/sfields/D.java b/org.springsource.loaded.testdata/src/main/java/sfields/D.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/D.java rename to org.springsource.loaded.testdata/src/main/java/sfields/D.java diff --git a/org.springsource.loaded.testdata/src/sfields/D2.java b/org.springsource.loaded.testdata/src/main/java/sfields/D2.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/D2.java rename to org.springsource.loaded.testdata/src/main/java/sfields/D2.java diff --git a/org.springsource.loaded.testdata/src/sfields/E.java b/org.springsource.loaded.testdata/src/main/java/sfields/E.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/E.java rename to org.springsource.loaded.testdata/src/main/java/sfields/E.java diff --git a/org.springsource.loaded.testdata/src/sfields/I.java b/org.springsource.loaded.testdata/src/main/java/sfields/I.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/I.java rename to org.springsource.loaded.testdata/src/main/java/sfields/I.java diff --git a/org.springsource.loaded.testdata/src/sfields/I2.java b/org.springsource.loaded.testdata/src/main/java/sfields/I2.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/I2.java rename to org.springsource.loaded.testdata/src/main/java/sfields/I2.java diff --git a/org.springsource.loaded.testdata/src/sfields/X.java b/org.springsource.loaded.testdata/src/main/java/sfields/X.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/X.java rename to org.springsource.loaded.testdata/src/main/java/sfields/X.java diff --git a/org.springsource.loaded.testdata/src/sfields/X2.java b/org.springsource.loaded.testdata/src/main/java/sfields/X2.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/X2.java rename to org.springsource.loaded.testdata/src/main/java/sfields/X2.java diff --git a/org.springsource.loaded.testdata/src/sfields/Y.java b/org.springsource.loaded.testdata/src/main/java/sfields/Y.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/Y.java rename to org.springsource.loaded.testdata/src/main/java/sfields/Y.java diff --git a/org.springsource.loaded.testdata/src/sfields/Y2.java b/org.springsource.loaded.testdata/src/main/java/sfields/Y2.java similarity index 100% rename from org.springsource.loaded.testdata/src/sfields/Y2.java rename to org.springsource.loaded.testdata/src/main/java/sfields/Y2.java diff --git a/org.springsource.loaded.testdata/src/springloaded.properties b/org.springsource.loaded.testdata/src/main/java/springloaded.properties similarity index 100% rename from org.springsource.loaded.testdata/src/springloaded.properties rename to org.springsource.loaded.testdata/src/main/java/springloaded.properties diff --git a/org.springsource.loaded.testdata/src/supercalls/OverloadExample.java b/org.springsource.loaded.testdata/src/main/java/supercalls/OverloadExample.java similarity index 100% rename from org.springsource.loaded.testdata/src/supercalls/OverloadExample.java rename to org.springsource.loaded.testdata/src/main/java/supercalls/OverloadExample.java diff --git a/org.springsource.loaded.testdata/src/supercalls/Runner.java b/org.springsource.loaded.testdata/src/main/java/supercalls/Runner.java similarity index 100% rename from org.springsource.loaded.testdata/src/supercalls/Runner.java rename to org.springsource.loaded.testdata/src/main/java/supercalls/Runner.java diff --git a/org.springsource.loaded.testdata/src/supercalls/Sub.java b/org.springsource.loaded.testdata/src/main/java/supercalls/Sub.java similarity index 100% rename from org.springsource.loaded.testdata/src/supercalls/Sub.java rename to org.springsource.loaded.testdata/src/main/java/supercalls/Sub.java diff --git a/org.springsource.loaded.testdata/src/supercalls/Sub002.java b/org.springsource.loaded.testdata/src/main/java/supercalls/Sub002.java similarity index 100% rename from org.springsource.loaded.testdata/src/supercalls/Sub002.java rename to org.springsource.loaded.testdata/src/main/java/supercalls/Sub002.java diff --git a/org.springsource.loaded.testdata/src/supercalls/Super.java b/org.springsource.loaded.testdata/src/main/java/supercalls/Super.java similarity index 100% rename from org.springsource.loaded.testdata/src/supercalls/Super.java rename to org.springsource.loaded.testdata/src/main/java/supercalls/Super.java diff --git a/org.springsource.loaded.testdata/src/system/Eight.java b/org.springsource.loaded.testdata/src/main/java/system/Eight.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Eight.java rename to org.springsource.loaded.testdata/src/main/java/system/Eight.java diff --git a/org.springsource.loaded.testdata/src/system/Five.java b/org.springsource.loaded.testdata/src/main/java/system/Five.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Five.java rename to org.springsource.loaded.testdata/src/main/java/system/Five.java diff --git a/org.springsource.loaded.testdata/src/system/Four.java b/org.springsource.loaded.testdata/src/main/java/system/Four.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Four.java rename to org.springsource.loaded.testdata/src/main/java/system/Four.java diff --git a/org.springsource.loaded.testdata/src/system/Nine.java b/org.springsource.loaded.testdata/src/main/java/system/Nine.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Nine.java rename to org.springsource.loaded.testdata/src/main/java/system/Nine.java diff --git a/org.springsource.loaded.testdata/src/system/One.java b/org.springsource.loaded.testdata/src/main/java/system/One.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/One.java rename to org.springsource.loaded.testdata/src/main/java/system/One.java diff --git a/org.springsource.loaded.testdata/src/system/Seven.java b/org.springsource.loaded.testdata/src/main/java/system/Seven.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Seven.java rename to org.springsource.loaded.testdata/src/main/java/system/Seven.java diff --git a/org.springsource.loaded.testdata/src/system/Six.java b/org.springsource.loaded.testdata/src/main/java/system/Six.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Six.java rename to org.springsource.loaded.testdata/src/main/java/system/Six.java diff --git a/org.springsource.loaded.testdata/src/system/Three.java b/org.springsource.loaded.testdata/src/main/java/system/Three.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Three.java rename to org.springsource.loaded.testdata/src/main/java/system/Three.java diff --git a/org.springsource.loaded.testdata/src/system/Two.java b/org.springsource.loaded.testdata/src/main/java/system/Two.java similarity index 100% rename from org.springsource.loaded.testdata/src/system/Two.java rename to org.springsource.loaded.testdata/src/main/java/system/Two.java diff --git a/org.springsource.loaded.testdata/src/test/Initializers.java b/org.springsource.loaded.testdata/src/main/java/test/Initializers.java similarity index 100% rename from org.springsource.loaded.testdata/src/test/Initializers.java rename to org.springsource.loaded.testdata/src/main/java/test/Initializers.java diff --git a/org.springsource.loaded.testdata/src/test/Interface.java b/org.springsource.loaded.testdata/src/main/java/test/Interface.java similarity index 100% rename from org.springsource.loaded.testdata/src/test/Interface.java rename to org.springsource.loaded.testdata/src/main/java/test/Interface.java diff --git a/org.springsource.loaded.testdata/src/test/SubInitializers.java b/org.springsource.loaded.testdata/src/main/java/test/SubInitializers.java similarity index 100% rename from org.springsource.loaded.testdata/src/test/SubInitializers.java rename to org.springsource.loaded.testdata/src/main/java/test/SubInitializers.java diff --git a/org.springsource.loaded.testdata/src/test/SubInterface.java b/org.springsource.loaded.testdata/src/main/java/test/SubInterface.java similarity index 100% rename from org.springsource.loaded.testdata/src/test/SubInterface.java rename to org.springsource.loaded.testdata/src/main/java/test/SubInterface.java diff --git a/org.springsource.loaded.testdata/src/testapp/Demo.java b/org.springsource.loaded.testdata/src/main/java/testapp/Demo.java similarity index 100% rename from org.springsource.loaded.testdata/src/testapp/Demo.java rename to org.springsource.loaded.testdata/src/main/java/testapp/Demo.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/A.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/A.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/A.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/A.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/A2.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/A2.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/A2.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/A2.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/B.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/B.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/B.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/B.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/B2.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/B2.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/B2.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/B2.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/C.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/C.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/C.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/C.java diff --git a/org.springsource.loaded.testdata/src/typedescriptor/C2.java b/org.springsource.loaded.testdata/src/main/java/typedescriptor/C2.java similarity index 100% rename from org.springsource.loaded.testdata/src/typedescriptor/C2.java rename to org.springsource.loaded.testdata/src/main/java/typedescriptor/C2.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeOne.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeOne.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeOne002.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne002.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeOne002.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne002.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeOne003.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne003.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeOne003.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeOne003.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeThreeBottom.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeBottom.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeThreeBottom.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeBottom.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeThreeMiddle.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeMiddle.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeThreeMiddle.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeMiddle.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeThreeTop.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeThreeTop.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeThreeTop002.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop002.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeThreeTop002.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop002.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeThreeTop003.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop003.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeThreeTop003.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeThreeTop003.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeTwoBottom.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoBottom.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeTwoBottom.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoBottom.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeTwoTop.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeTwoTop.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeTwoTop002.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop002.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeTwoTop002.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop002.java diff --git a/org.springsource.loaded.testdata/src/virtual/CalleeTwoTop003.java b/org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop003.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CalleeTwoTop003.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CalleeTwoTop003.java diff --git a/org.springsource.loaded.testdata/src/virtual/CallerOne.java b/org.springsource.loaded.testdata/src/main/java/virtual/CallerOne.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CallerOne.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CallerOne.java diff --git a/org.springsource.loaded.testdata/src/virtual/CallerThree.java b/org.springsource.loaded.testdata/src/main/java/virtual/CallerThree.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CallerThree.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CallerThree.java diff --git a/org.springsource.loaded.testdata/src/virtual/CallerTwo.java b/org.springsource.loaded.testdata/src/main/java/virtual/CallerTwo.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/CallerTwo.java rename to org.springsource.loaded.testdata/src/main/java/virtual/CallerTwo.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBot.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBot.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBot.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBot.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBot2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBot2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBot2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBot2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBotB.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBotB.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBotB.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBotB.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBotB2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBotB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBotB2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBotB2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBotC.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBotC.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBotC.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBotC.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourBotC2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourBotC2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourBotC2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourBotC2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourMidB.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourMidB.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourMidB.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourMidB.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourMidB2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourMidB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourMidB2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourMidB2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourMidC.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourMidC.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourMidC.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourMidC.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourMidC2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourMidC2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourMidC2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourMidC2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTop.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTop.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTop.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTop.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTop2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTop2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTop2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTop2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTopB.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTopB.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTopB.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTopB.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTopB2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTopB2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTopB2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTopB2.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTopC.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTopC.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTopC.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTopC.java diff --git a/org.springsource.loaded.testdata/src/virtual/FourTopC2.java b/org.springsource.loaded.testdata/src/main/java/virtual/FourTopC2.java similarity index 100% rename from org.springsource.loaded.testdata/src/virtual/FourTopC2.java rename to org.springsource.loaded.testdata/src/main/java/virtual/FourTopC2.java diff --git a/org.springsource.loaded/.classpath b/org.springsource.loaded/.classpath index e678c75..4fa6902 100644 --- a/org.springsource.loaded/.classpath +++ b/org.springsource.loaded/.classpath @@ -1,12 +1,9 @@ - + - - - - - + + diff --git a/org.springsource.loaded/.project b/org.springsource.loaded/.project index b565646..20c28e2 100644 --- a/org.springsource.loaded/.project +++ b/org.springsource.loaded/.project @@ -12,6 +12,8 @@ + org.springsource.ide.eclipse.gradle.core.nature org.eclipse.jdt.core.javanature + org.eclipse.jdt.groovy.core.groovyNature diff --git a/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs new file mode 100644 index 0000000..5a8192f --- /dev/null +++ b/org.springsource.loaded/.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=.. diff --git a/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs b/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs new file mode 100644 index 0000000..663c0a7 --- /dev/null +++ b/org.springsource.loaded/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs @@ -0,0 +1,3 @@ +#org.springsource.ide.eclipse.gradle.core.actions.GradleRefreshPreferences +#Thu Sep 05 19:59:13 CEST 2013 +enableDSLD=false diff --git a/org.springsource.loaded/.settings/org.eclipse.jdt.groovy.core.prefs b/org.springsource.loaded/.settings/org.eclipse.jdt.groovy.core.prefs new file mode 100644 index 0000000..a0aa4d4 --- /dev/null +++ b/org.springsource.loaded/.settings/org.eclipse.jdt.groovy.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +groovy.compiler.level=20 diff --git a/org.springsource.loaded/META-INF/MANIFEST.MF b/org.springsource.loaded/META-INF/MANIFEST.MF deleted file mode 100644 index 149cfa7..0000000 --- a/org.springsource.loaded/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.7.1 -Created-By: 11.3-b02 (Sun Microsystems Inc.) -Specification-Title: SpringLoaded Agent -Specification-Version: 1.0.0 -Specification-Vendor: SpringSource -Implementation-Title: org.springsource.loaded -Implementation-Version: 1.0.0 -Implementation-Vendor: SpringSource -Premain-Class: org.springsource.loaded.agent.SpringLoadedAgent -Can-Redefine-Classes: true - diff --git a/org.springsource.loaded/asm-3.2/lib/all/README.txt b/org.springsource.loaded/asm-3.2/lib/all/README.txt deleted file mode 100644 index d7c96a5..0000000 --- a/org.springsource.loaded/asm-3.2/lib/all/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -It is highly recommended to use only the necessary ASM jars for your -application instead of using the asm-all jar, unless you really need -all ASM packages. \ No newline at end of file diff --git a/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.jar b/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.jar deleted file mode 100644 index d0ad60e..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.pom b/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.pom deleted file mode 100644 index 9899a54..0000000 --- a/org.springsource.loaded/asm-3.2/lib/all/asm-all-3.2.pom +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - - asm - asm-parent - 3.2 - - - ASM All - asm - asm-all - jar - - diff --git a/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.jar b/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.jar deleted file mode 100644 index 94b8549..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.pom b/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.pom deleted file mode 100644 index 9899a54..0000000 --- a/org.springsource.loaded/asm-3.2/lib/all/asm-debug-all-3.2.pom +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - - - asm - asm-parent - 3.2 - - - ASM All - asm - asm-all - jar - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-3.2.jar deleted file mode 100644 index 334e7fd..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-3.2.pom deleted file mode 100644 index c714db0..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-3.2.pom +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM Core - asm - jar - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.jar deleted file mode 100644 index 40ee315..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.pom deleted file mode 100644 index b393338..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-analysis-3.2.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM Analysis - asm-analysis - jar - - - - asm-tree - asm - - - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.jar deleted file mode 100644 index 8dfed0a..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.pom deleted file mode 100644 index 8517715..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-commons-3.2.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM Commons - asm-commons - jar - - - - asm-tree - asm - - - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-parent-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-parent-3.2.pom deleted file mode 100644 index c220347..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-parent-3.2.pom +++ /dev/null @@ -1,136 +0,0 @@ - - 4.0.0 - - asm-parent - asm - 3.2 - pom - - ASM - A very small and fast Java bytecode manipulation framework - http://asm.objectweb.org/ - - - ObjectWeb - http://www.objectweb.org/ - - 2000 - - - - BSD - http://asm.objectweb.org/license.html - - - - - - Eric Bruneton - ebruneton - Eric.Bruneton@rd.francetelecom.com - - Creator - Java Developer - - - - Eugene Kuleshov - eu - eu@javatx.org - - Java Developer - - - - - - scm:cvs:pserver:anonymous:@cvs.forge.objectweb.org:/cvsroot/asm:asm - scm:cvs:ext:${maven.username}@cvs.forge.objectweb.org:/cvsroot/asm:asm - http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/asm/ - - - - http://forge.objectweb.org/tracker/?group_id=23 - - - - - - - asm - ${project.groupId} - ${project.version} - - - - asm-tree - ${project.groupId} - ${project.version} - - - - asm-analysis - ${project.groupId} - ${project.version} - - - - asm-commons - ${project.groupId} - ${project.version} - - - - asm-util - ${project.groupId} - ${project.version} - - - - asm-xml - ${project.groupId} - ${project.version} - - - - - - - - ASM Users List - sympa@ow2.org?subject=subscribe%20asm - sympa@ow2.org?subject=unsubscribe%20asm - asm@ow2.org - http://www.ow2.org/wws/arc/asm - - - ASM Team List - sympa@ow2.org?subject=subscribe%20asm-team - sympa@ow2.org?subject=unsubscribe%20asm-team - asm-team@ow2.org - http://www.ow2.org/wws/arc/asm-team - - - - - http://mojo.codehaus.org/my-project - - objectweb - false - ObjectWeb Maven 2.0 Repository - dav:https://maven.forge.objectweb.org:8002/maven2/ - default - - - objectweb.snapshots - false - ObjectWeb Maven 2.0 Snapshot Repository - dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/ - default - - - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.jar deleted file mode 100644 index b21fb86..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.pom deleted file mode 100644 index 9f45452..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-tree-3.2.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM Tree - asm-tree - jar - - - - asm - asm - - - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.jar deleted file mode 100644 index 499d229..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.pom deleted file mode 100644 index e302b0f..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-util-3.2.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM Util - asm-util - jar - - - - asm-tree - asm - - - - diff --git a/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.jar b/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.jar deleted file mode 100644 index 31b31b5..0000000 Binary files a/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.jar and /dev/null differ diff --git a/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.pom b/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.pom deleted file mode 100644 index 0f3de1f..0000000 --- a/org.springsource.loaded/asm-3.2/lib/asm-xml-3.2.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - - - asm-parent - asm - 3.2 - - - ASM XML - asm-xml - jar - - - - asm-util - asm - - - - diff --git a/org.springsource.loaded/asm-3.2/src.zip b/org.springsource.loaded/asm-3.2/src.zip deleted file mode 100644 index 479dc68..0000000 Binary files a/org.springsource.loaded/asm-3.2/src.zip and /dev/null differ diff --git a/org.springsource.loaded/build.gradle b/org.springsource.loaded/build.gradle index d5bdc3c..3d90a0f 100644 --- a/org.springsource.loaded/build.gradle +++ b/org.springsource.loaded/build.gradle @@ -11,12 +11,16 @@ configurations { } dependencies { - compile 'asm:asm-all:3.2' tools 'com.googlecode.jarjar:jarjar:1.3' + + compile 'asm:asm-all:3.2' + testCompile 'junit:junit:4.11' + testCompileOnly files("../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar") testCompileOnly project(':org.springsource.loaded.testdata') testCompileOnly project(':org.springsource.loaded.testdata.groovy') + testCompileOnly project(':org.springsource.loaded.testdata.plugin') testCompileOnly project(':org.springsource.loaded.testdata.subloader') testCompileOnly project(':org.springsource.loaded.testdata.superloader') } @@ -30,20 +34,31 @@ sourceSets { test { jvmArgs "-noverify" //debug true - //include "**/*PluginTests*" systemProperties["springloaded.tests.useGradleBuildDir"] = true + systemProperties["springloaded.tests.generatedTests"] = false } task jarAll(type: Jar, dependsOn: jar) { - def metaInfDir = "$projectDir/META-INF" + manifest { + attributes( + "Specification-Vendor": "SpringSource", + "Specification-Title": "SpringLoaded Agent", + "Specification-Version": version, + "Implementation-Vendor": "SpringSource", + "Implementation-Title": "org.springsource.loaded", + "Implementation-Version": version, + "Premain-Class": "org.springsource.loaded.agent.SpringLoadedAgent", + "Can-Redefine-Classes": "true" + ) + } + inputs.files jar.archivePath - inputs.dir metaInfDir classifier = 'agent' + doLast { project.ant { taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask", classpath: configurations.tools.asPath - jarjar(jarfile: archivePath, manifest: "$metaInfDir/MANIFEST.MF") { - zipfileset(dir: "$metaInfDir", prefix: 'META-INF') + jarjar(jarfile: archivePath, manifest: "$temporaryDir/MANIFEST.MF") { zipfileset(src: jar.archivePath) configurations.compile.files.each { jarjarFile -> zipfileset(src: jarjarFile) diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java b/org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java index 6c99422..82507f4 100644 --- a/org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java +++ b/org.springsource.loaded/src/main/java/org/springsource/loaded/GlobalConfiguration.java @@ -99,7 +99,7 @@ public class GlobalConfiguration { public final static boolean interceptReflection = true; - public static boolean generatedTestsOn = false; + public static boolean generatedTestsOn = Boolean.parseBoolean(System.getProperty("springloaded.tests.generatedTests", "true")); public static boolean reloadMessages = false;// can be forced on for testing diff --git a/org.springsource.loaded/tools/jarjar-1.0.jar b/org.springsource.loaded/tools/jarjar-1.0.jar deleted file mode 100644 index 89390bf..0000000 Binary files a/org.springsource.loaded/tools/jarjar-1.0.jar and /dev/null differ