diff --git a/build.gradle b/build.gradle
index 4e4bc17..746bff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,4 @@
allprojects {
- apply plugin: 'idea'
-
configurations {
tools
}
@@ -12,5 +10,8 @@ allprojects {
subprojects {
apply plugin: 'java'
+
+ sourceCompatibility = 1.6
+ targetCompatibility = 1.6
}
diff --git a/org.springsource.loaded.testdata.groovy/build.gradle b/org.springsource.loaded.testdata.groovy/build.gradle
new file mode 100644
index 0000000..7983c28
--- /dev/null
+++ b/org.springsource.loaded.testdata.groovy/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: "groovy"
+
+dependencies {
+ compile files("groovy-1.8.2.jar")
+}
+
+sourceSets {
+ main {
+ groovy {
+ srcDir 'src'
+ }
+ }
+}
diff --git a/org.springsource.loaded.testdata.plugin/.classpath b/org.springsource.loaded.testdata.plugin/.classpath
new file mode 100644
index 0000000..599772f
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/org.springsource.loaded.testdata.plugin/.project b/org.springsource.loaded.testdata.plugin/.project
new file mode 100644
index 0000000..e3e96c7
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/.project
@@ -0,0 +1,17 @@
+
+
+ org.springsource.loaded.testdata.plugin
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs b/org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4a3cbc4
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Feb 08 11:33:02 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.plugin/LICENSES/LICENSE b/org.springsource.loaded.testdata.plugin/LICENSES/LICENSE
new file mode 100644
index 0000000..9367734
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/LICENSES/LICENSE
@@ -0,0 +1,351 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+=======================================================================
+
+Spring Loaded 1.1.0:
+
+Spring Loaded 1.1.0 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
+
+ >>> asm - 3.2
+ >>> asm-commons - 3.2
+ >>> asm-tree - 3.2
+ >>> asm-util - 3.2
+
+-------------SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES------------------------------
+
+BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s)
+
+
+>>> asm - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2007 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+>>> asm-commons - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-tree - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-util - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+[SPRINGLOADED110KL072612]
+
diff --git a/org.springsource.loaded.testdata.plugin/build.gradle b/org.springsource.loaded.testdata.plugin/build.gradle
new file mode 100644
index 0000000..ee4cf7f
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/build.gradle
@@ -0,0 +1,11 @@
+dependencies {
+ compile project(":org.springsource.loaded")
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src'
+ }
+ }
+}
diff --git a/org.springsource.loaded.testdata.plugin/src/com/test/plugins/ReloadEventProcessorPlugin1.java b/org.springsource.loaded.testdata.plugin/src/com/test/plugins/ReloadEventProcessorPlugin1.java
new file mode 100644
index 0000000..425ec04
--- /dev/null
+++ b/org.springsource.loaded.testdata.plugin/src/com/test/plugins/ReloadEventProcessorPlugin1.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.subloader/.classpath b/org.springsource.loaded.testdata.subloader/.classpath
new file mode 100644
index 0000000..18034aa
--- /dev/null
+++ b/org.springsource.loaded.testdata.subloader/.classpath
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/org.springsource.loaded.testdata.subloader/.project b/org.springsource.loaded.testdata.subloader/.project
new file mode 100644
index 0000000..dfdd770
--- /dev/null
+++ b/org.springsource.loaded.testdata.subloader/.project
@@ -0,0 +1,17 @@
+
+
+ org.springsource.loaded.testdata.subloader
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs b/org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4a3cbc4
--- /dev/null
+++ b/org.springsource.loaded.testdata.subloader/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Feb 08 11:33:02 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.subloader/LICENSES/LICENSE b/org.springsource.loaded.testdata.subloader/LICENSES/LICENSE
new file mode 100644
index 0000000..9367734
--- /dev/null
+++ b/org.springsource.loaded.testdata.subloader/LICENSES/LICENSE
@@ -0,0 +1,351 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+=======================================================================
+
+Spring Loaded 1.1.0:
+
+Spring Loaded 1.1.0 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
+
+ >>> asm - 3.2
+ >>> asm-commons - 3.2
+ >>> asm-tree - 3.2
+ >>> asm-util - 3.2
+
+-------------SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES------------------------------
+
+BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s)
+
+
+>>> asm - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2007 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+>>> asm-commons - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-tree - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-util - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+[SPRINGLOADED110KL072612]
+
diff --git a/org.springsource.loaded.testdata.subloader/build.gradle b/org.springsource.loaded.testdata.subloader/build.gradle
new file mode 100644
index 0000000..79cc620
--- /dev/null
+++ b/org.springsource.loaded.testdata.subloader/build.gradle
@@ -0,0 +1,11 @@
+dependencies {
+ compile project(":org.springsource.loaded.testdata.superloader")
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src'
+ }
+ }
+}
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
new file mode 100644
index 0000000..6cc192b
Binary files /dev/null and b/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2-sources.jar 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
new file mode 100644
index 0000000..ed07cb5
Binary files /dev/null and b/org.springsource.loaded.testdata.subloader/lib/cglib-nodep-2.2.jar differ
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Bottom.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Bottom.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Bottom.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Bottom002.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom002.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Bottom002.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Bottom002.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Bottom003.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Bottom003.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Bottom003.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Bottom003.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/BottomB.java b/org.springsource.loaded.testdata.subloader/src/subpkg/BottomB.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/BottomB.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/BottomB.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/BottomB002.java b/org.springsource.loaded.testdata.subloader/src/subpkg/BottomB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/BottomB002.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/BottomB002.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Invoker.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Invoker.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Invoker.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Invoker.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Invoker002.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Invoker002.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Invoker002.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Invoker002.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerB.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerB.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerB002.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerB002.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerB002.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerC.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerC.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerC002.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC002.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerC002.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC002.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerC003.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC003.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerC003.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerC003.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/InvokerD.java b/org.springsource.loaded.testdata.subloader/src/subpkg/InvokerD.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/InvokerD.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/InvokerD.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/ProxyBuilder.java b/org.springsource.loaded.testdata.subloader/src/subpkg/ProxyBuilder.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/ProxyBuilder.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/ProxyBuilder.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/ProxyTestcase.java b/org.springsource.loaded.testdata.subloader/src/subpkg/ProxyTestcase.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/ProxyTestcase.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/ProxyTestcase.java
diff --git a/org.springsource.loaded.testdata/subsrc/subpkg/Subby.java b/org.springsource.loaded.testdata.subloader/src/subpkg/Subby.java
similarity index 100%
rename from org.springsource.loaded.testdata/subsrc/subpkg/Subby.java
rename to org.springsource.loaded.testdata.subloader/src/subpkg/Subby.java
diff --git a/org.springsource.loaded.testdata.superloader/.classpath b/org.springsource.loaded.testdata.superloader/.classpath
new file mode 100644
index 0000000..b5f66f0
--- /dev/null
+++ b/org.springsource.loaded.testdata.superloader/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/org.springsource.loaded.testdata.superloader/.project b/org.springsource.loaded.testdata.superloader/.project
new file mode 100644
index 0000000..343fb9e
--- /dev/null
+++ b/org.springsource.loaded.testdata.superloader/.project
@@ -0,0 +1,17 @@
+
+
+ org.springsource.loaded.testdata.superloader
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs b/org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..4a3cbc4
--- /dev/null
+++ b/org.springsource.loaded.testdata.superloader/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Feb 08 11:33:02 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.springsource.loaded.testdata.superloader/LICENSES/LICENSE b/org.springsource.loaded.testdata.superloader/LICENSES/LICENSE
new file mode 100644
index 0000000..9367734
--- /dev/null
+++ b/org.springsource.loaded.testdata.superloader/LICENSES/LICENSE
@@ -0,0 +1,351 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+=======================================================================
+
+Spring Loaded 1.1.0:
+
+Spring Loaded 1.1.0 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
+
+ >>> asm - 3.2
+ >>> asm-commons - 3.2
+ >>> asm-tree - 3.2
+ >>> asm-util - 3.2
+
+-------------SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES------------------------------
+
+BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s)
+
+
+>>> asm - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2007 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+>>> asm-commons - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-tree - 3.2
+
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+>>> asm-util - 3.2
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+[SPRINGLOADED110KL072612]
+
diff --git a/org.springsource.loaded.testdata.superloader/build.gradle b/org.springsource.loaded.testdata.superloader/build.gradle
new file mode 100644
index 0000000..bb7266b
--- /dev/null
+++ b/org.springsource.loaded.testdata.superloader/build.gradle
@@ -0,0 +1,11 @@
+dependencies {
+ compile "cglib:cglib:2.2.2"
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src'
+ }
+ }
+}
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
new file mode 100644
index 0000000..6cc192b
Binary files /dev/null and b/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2-sources.jar 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
new file mode 100644
index 0000000..ed07cb5
Binary files /dev/null and b/org.springsource.loaded.testdata.superloader/lib/cglib-nodep-2.2.jar differ
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/MyMethodInterceptor.java b/org.springsource.loaded.testdata.superloader/src/superpkg/MyMethodInterceptor.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/MyMethodInterceptor.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/MyMethodInterceptor.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Simple.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Simple.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Simple.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Simple.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Target.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Target.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Target.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Target.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Target002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Target002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Target002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Target002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetB.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetB.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetB.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetB.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetB002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetB002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetB002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetC.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetC.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetC.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetC.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetC002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetC002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetC002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetC002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetD.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetD.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetD.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetD.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetD002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetD002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetD002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetD002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetImplC.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetImplC.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TargetImplC002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TargetImplC002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TargetImplC002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Top.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Top.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Top.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Top.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Top002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Top002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Top002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Top002.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/Top003.java b/org.springsource.loaded.testdata.superloader/src/superpkg/Top003.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/Top003.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/Top003.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TopB.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TopB.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TopB.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TopB.java
diff --git a/org.springsource.loaded.testdata/supersrc/superpkg/TopB002.java b/org.springsource.loaded.testdata.superloader/src/superpkg/TopB002.java
similarity index 100%
rename from org.springsource.loaded.testdata/supersrc/superpkg/TopB002.java
rename to org.springsource.loaded.testdata.superloader/src/superpkg/TopB002.java
diff --git a/org.springsource.loaded.testdata/.classpath b/org.springsource.loaded.testdata/.classpath
index 4419bd0..87fe2cb 100644
--- a/org.springsource.loaded.testdata/.classpath
+++ b/org.springsource.loaded.testdata/.classpath
@@ -3,8 +3,6 @@
-
-
diff --git a/org.springsource.loaded.testdata/build.gradle b/org.springsource.loaded.testdata/build.gradle
index dd9d131..b5ec123 100644
--- a/org.springsource.loaded.testdata/build.gradle
+++ b/org.springsource.loaded.testdata/build.gradle
@@ -1,16 +1,16 @@
def aspectjVersion = "1.7.1"
configurations {
- ajc
aspects
ajInpath
}
dependencies {
- ajc "org.aspectj:aspectjtools:$aspectjVersion"
+ tools "org.aspectj:aspectjtools:$aspectjVersion"
compile "cglib:cglib:2.2.2"
compile "org.aspectj:aspectjrt:$aspectjVersion"
compile 'asm:asm-all:3.2'
+ compile files("code.jar")
}
sourceSets {
@@ -18,38 +18,31 @@ sourceSets {
java {
srcDir 'src'
srcDir 'cglibsrc'
- srcDir 'subsrc'
- srcDir 'supersrc'
}
}
}
compileJava.deleteAllActions()
-compileJava << {
+
+task aspectJ(dependsOn: JavaPlugin.PROCESS_RESOURCES_TASK_NAME) {
+ dependsOn configurations.tools.getTaskDependencyFromProjectDependency(true, "compileJava")
def srcDirs = sourceSets.main.java.srcDirs
srcDirs.each { inputs.dir it }
def destDir = sourceSets.main.output.classesDir
outputs.dir destDir
doLast {
- ant.taskdef(
- resource: 'org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties',
- classpath: configurations.ajc.asPath)
+ ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: configurations.tools.asPath)
- ant.iajc(
- source: sourceCompatibility,
- target: targetCompatibility,
- destDir: sourceSets.main.output.classesDir.absolutePath,
- fork: 'true',
- X: 'noInline',
- aspectPath: configurations.aspects.asPath,
- inpath: configurations.ajInpath.asPath,
- sourceRootCopyFilter: '**/*.java,**/*.aj',
- classpath: configurations.compile.asPath) {
- sourceroots {
- sourceSets.main.java.srcDirs.each { dir ->
- pathelement(location: dir.absolutePath)
- }
- }
+ ant.iajc(source:sourceCompatibility, target:targetCompatibility, destDir: destDir.absolutePath, maxmem:"512m", fork:"true",
+ aspectPath: configurations.aspects.asPath, inpath:configurations.ajInpath.asPath, sourceRootCopyFilter:"**/.svn/*,**/*.java",classpath:configurations.compile.asPath ){
+ sourceroots {
+ srcDirs.each {
+ if (it.exists()) pathelement location: it.absolutePath
}
+ }
+ }
}
}
+
+compileJava.dependsOn aspectJ
+
diff --git a/org.springsource.loaded/build.gradle b/org.springsource.loaded/build.gradle
index 8943d8f..d5bdc3c 100644
--- a/org.springsource.loaded/build.gradle
+++ b/org.springsource.loaded/build.gradle
@@ -1,6 +1,3 @@
-
-apply plugin: 'maven'
-
group = "org.springsource.loaded"
version = '1.1.1-dev'
jar.baseName = 'spring-loaded'
@@ -9,15 +6,32 @@ compileJava {
options.debug = true
}
+configurations {
+ testCompileOnly
+}
+
dependencies {
compile 'asm:asm-all:3.2'
tools 'com.googlecode.jarjar:jarjar:1.3'
testCompile 'junit:junit:4.11'
- testCompile project(':org.springsource.loaded.testdata')
+ 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.subloader')
+ testCompileOnly project(':org.springsource.loaded.testdata.superloader')
}
+sourceSets {
+ test {
+ compileClasspath += configurations.testCompileOnly
+ }
+}
+
test {
jvmArgs "-noverify"
+ //debug true
+ //include "**/*PluginTests*"
+ systemProperties["springloaded.tests.useGradleBuildDir"] = true
}
task jarAll(type: Jar, dependsOn: jar) {
diff --git a/org.springsource.loaded/settings.gradle b/org.springsource.loaded/settings.gradle
deleted file mode 100644
index e69de29..0000000
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
index a6c3a9a..58600e2 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java
@@ -33,7 +33,7 @@ public class ReloadingJVM {
private ReloadingJVM() {
try {
javaclasspath = System.getProperty("java.class.path");
- javaclasspath = javaclasspath + File.pathSeparator + "../org.springsource.loaded.testdata/bin";
+ javaclasspath = javaclasspath + File.pathSeparator + TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
if (DEBUG_CLIENT_SIDE) {
System.out.println("(client) Classpath for JVM that is being launched: " + javaclasspath);
}
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
index b6c2a9d..c9fb0d6 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/SpringLoadedTests.java
@@ -86,8 +86,8 @@ public abstract class SpringLoadedTests implements Constants {
*/
protected ClassLoader binLoader;
- protected String TestDataPath = "../org.springsource.loaded.testdata/bin";
- protected String GroovyTestDataPath = "../org.springsource.loaded.testdata.groovy/bin";
+ protected String TestDataPath = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+ protected String GroovyTestDataPath = TestUtils.getPathToClasses("../org.springsource.loaded.testdata.groovy");
protected String AspectjrtJar = "../org.springsource.loaded.testdata/aspectjrt.jar";
protected String CodeJar = "../org.springsource.loaded.testdata/code.jar";
protected String GroovyrtJar = "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar";
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestUtils.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestUtils.java
new file mode 100644
index 0000000..f5b9335
--- /dev/null
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/TestUtils.java
@@ -0,0 +1,11 @@
+package org.springsource.loaded.test;
+
+public class TestUtils {
+ public static String getPathToClasses(String path) {
+ if (Boolean.parseBoolean(System.getProperty("springloaded.tests.useGradleBuildDir", "false"))) {
+ return path + "/build/classes/main";
+ } else {
+ return path + "/bin";
+ }
+ }
+}
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
index 1cd0009..df69422 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SubLoader.java
@@ -30,6 +30,7 @@ import org.springsource.loaded.ReloadableType;
import org.springsource.loaded.TypeRegistry;
import org.springsource.loaded.Utils;
import org.springsource.loaded.agent.SpringLoadedPreProcessor;
+import org.springsource.loaded.test.TestUtils;
/**
@@ -41,7 +42,7 @@ public class SubLoader extends ClassLoader {
// @formatter:off
static String[] folders = new String[] {
- "../org.springsource.loaded.testdata/subbin"
+ TestUtils.getPathToClasses("../org.springsource.loaded.testdata.subloader")
};
static String[] jars = new String[] {
"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
@@ -77,7 +78,7 @@ public class SubLoader extends ClassLoader {
String[] newFolders = new String[3];
newFolders[0] = folders[0];
newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
- newFolders[2] = "../org.springsource.loaded.testdata/bin";
+ newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
folders = newFolders;
}
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
index 845e5d2..9acd4c5 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/SuperLoader.java
@@ -30,6 +30,7 @@ import org.springsource.loaded.ReloadableType;
import org.springsource.loaded.TypeRegistry;
import org.springsource.loaded.Utils;
import org.springsource.loaded.agent.SpringLoadedPreProcessor;
+import org.springsource.loaded.test.TestUtils;
/**
@@ -41,7 +42,7 @@ public class SuperLoader extends ClassLoader {
// @formatter:off
static String[] folders = new String[] {
- "../org.springsource.loaded.testdata/superbin"
+ TestUtils.getPathToClasses("../org.springsource.loaded.testdata.superloader")
};
static String[] jars = new String[] {
"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
@@ -67,7 +68,7 @@ public class SuperLoader extends ClassLoader {
String[] newFolders = new String[3];
newFolders[0] = folders[0];
newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
- newFolders[2] = "../org.springsource.loaded.testdata/bin";
+ newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
folders = newFolders;
}
diff --git a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
index 582e639..3b165ce 100644
--- a/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
+++ b/org.springsource.loaded/src/test/java/org/springsource/loaded/test/infra/TestClassloaderWithRewriting.java
@@ -31,6 +31,7 @@ import org.springsource.loaded.ReloadableType;
import org.springsource.loaded.TypeRegistry;
import org.springsource.loaded.Utils;
import org.springsource.loaded.agent.SpringLoadedPreProcessor;
+import org.springsource.loaded.test.TestUtils;
/**
@@ -47,7 +48,7 @@ public class TestClassloaderWithRewriting extends ClassLoader {
// @formatter:off
static String[] folders = new String[] {
- "../org.springsource.loaded.testdata.groovy/bin"
+ TestUtils.getPathToClasses("../org.springsource.loaded.testdata.groovy")
};
static String[] jars = new String[] {
"../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar"
@@ -67,10 +68,11 @@ public class TestClassloaderWithRewriting extends ClassLoader {
}
public TestClassloaderWithRewriting(String metainfFolder, boolean b) {
- String[] newFolders = new String[3];
+ String[] newFolders = new String[4];
newFolders[0] = folders[0];
newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
- newFolders[2] = "../org.springsource.loaded.testdata/bin";
+ newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
+ newFolders[3] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata.plugin");
folders = newFolders;
jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
}
@@ -80,7 +82,7 @@ public class TestClassloaderWithRewriting extends ClassLoader {
String[] newFolders = new String[3];
newFolders[0] = folders[0];
newFolders[1] = "../org.springsource.loaded.testdata/" + metainfFolder;
- newFolders[2] = "../org.springsource.loaded.testdata/bin";
+ newFolders[2] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
folders = newFolders;
this.useRegistry = useRegistry;
jars = new String[] { "../org.springsource.loaded.testdata.groovy/groovy-1.8.2.jar" };
@@ -89,7 +91,7 @@ public class TestClassloaderWithRewriting extends ClassLoader {
public TestClassloaderWithRewriting(boolean b, boolean useRegistry, boolean addCglib) {
String[] newFolders = new String[2];
newFolders[0] = folders[0];
- newFolders[1] = "../org.springsource.loaded.testdata/bin";
+ newFolders[1] = TestUtils.getPathToClasses("../org.springsource.loaded.testdata");
folders = newFolders;
this.useRegistry = useRegistry;
jars = new String[] { "../org.springsource.loaded.testdata/lib/cglib-nodep-2.2.jar" };
diff --git a/settings.gradle b/settings.gradle
index 971dc4c..776f6ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,6 @@
include "org.springsource.loaded"
include "org.springsource.loaded.testdata"
+include "org.springsource.loaded.testdata.groovy"
+include "org.springsource.loaded.testdata.plugin"
+include "org.springsource.loaded.testdata.subloader"
+include "org.springsource.loaded.testdata.superloader"