diff options
-rw-r--r-- | Android.mk | 10 | ||||
-rw-r--r-- | README.version | 5 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/Objenesis.java (renamed from main/src/org/objenesis/Objenesis.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/ObjenesisBase.java (renamed from main/src/org/objenesis/ObjenesisBase.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/ObjenesisException.java (renamed from main/src/org/objenesis/ObjenesisException.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/ObjenesisHelper.java (renamed from main/src/org/objenesis/ObjenesisHelper.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/ObjenesisSerializer.java (renamed from main/src/org/objenesis/ObjenesisSerializer.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/ObjenesisStd.java (renamed from main/src/org/objenesis/ObjenesisStd.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/NullInstantiator.java (renamed from main/src/org/objenesis/instantiator/NullInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/ObjectInstantiator.java (renamed from main/src/org/objenesis/instantiator/ObjectInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/SerializationInstantiatorHelper.java (renamed from main/src/org/objenesis/instantiator/SerializationInstantiatorHelper.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/android/AndroidInstantiator.java (renamed from main/src/org/objenesis/instantiator/android/AndroidInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java (renamed from main/src/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/basic/AccessibleInstantiator.java (renamed from main/src/org/objenesis/instantiator/basic/AccessibleInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/basic/ConstructorInstantiator.java (renamed from main/src/org/objenesis/instantiator/basic/ConstructorInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java (renamed from main/src/org/objenesis/instantiator/basic/NewInstanceInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java (renamed from main/src/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java (renamed from main/src/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiator.java (renamed from main/src/org/objenesis/instantiator/gcj/GCJInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java (renamed from main/src/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java (renamed from main/src/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java (renamed from main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java (renamed from main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/perc/PercInstantiator.java (renamed from main/src/org/objenesis/instantiator/perc/PercInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/perc/PercSerializationInstantiator.java (renamed from main/src/org/objenesis/instantiator/perc/PercSerializationInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/Sun13Instantiator.java (renamed from main/src/org/objenesis/instantiator/sun/Sun13Instantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java (renamed from main/src/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java (renamed from main/src/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java (renamed from main/src/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java (renamed from main/src/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java (renamed from main/src/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/strategy/BaseInstantiatorStrategy.java (renamed from main/src/org/objenesis/strategy/BaseInstantiatorStrategy.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/strategy/InstantiatorStrategy.java (renamed from main/src/org/objenesis/strategy/InstantiatorStrategy.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/strategy/SerializingInstantiatorStrategy.java (renamed from main/src/org/objenesis/strategy/SerializingInstantiatorStrategy.java) | 0 | ||||
-rw-r--r-- | main/src/main/java/org/objenesis/strategy/StdInstantiatorStrategy.java (renamed from main/src/org/objenesis/strategy/StdInstantiatorStrategy.java) | 0 | ||||
-rw-r--r-- | main/src/test/java/org/objenesis/ObjenesisExceptionTest.java (renamed from main/test/org/objenesis/ObjenesisExceptionTest.java) | 0 | ||||
-rw-r--r-- | main/src/test/java/org/objenesis/ObjenesisTest.java (renamed from main/test/org/objenesis/ObjenesisTest.java) | 0 | ||||
-rw-r--r-- | main/src/test/java/org/objenesis/SerializingInstantiatorTest.java (renamed from main/test/org/objenesis/SerializingInstantiatorTest.java) | 0 | ||||
-rw-r--r-- | tck-android/Android.mk | 6 | ||||
-rw-r--r-- | tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java (renamed from tck-android/src/org/objenesis/tck/android/TckInstrumentation.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/CandidateLoader.java (renamed from tck/src/org/objenesis/tck/CandidateLoader.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/Main.java (renamed from tck/src/org/objenesis/tck/Main.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/Reporter.java (renamed from tck/src/org/objenesis/tck/Reporter.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/TCK.java (renamed from tck/src/org/objenesis/tck/TCK.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/TextReporter.java (renamed from tck/src/org/objenesis/tck/TextReporter.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/ConstructorThrowingException.java (renamed from tck/src/org/objenesis/tck/candidates/ConstructorThrowingException.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithArguments.java (renamed from tck/src/org/objenesis/tck/candidates/ConstructorWithArguments.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java (renamed from tck/src/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/DefaultPackageConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/DefaultPackageConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/DefaultPrivateConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/DefaultPrivateConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/DefaultProtectedConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/DefaultProtectedConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/DefaultPublicConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/DefaultPublicConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/NoConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/NoConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableNoConstructor.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableNoConstructor.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableReplacer.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableReplacer.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableResolver.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableResolver.java) | 0 | ||||
-rw-r--r-- | tck/src/main/java/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java (renamed from tck/src/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java) | 0 | ||||
-rw-r--r-- | tck/src/main/resources/org/objenesis/tck/candidates/candidates.properties (renamed from tck/src/org/objenesis/tck/candidates/candidates.properties) | 0 | ||||
-rw-r--r-- | tck/src/main/resources/org/objenesis/tck/candidates/serializable-candidates.properties (renamed from tck/src/org/objenesis/tck/candidates/serializable-candidates.properties) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/objenesis/tck/CandidateLoaderTest.java (renamed from tck/test/org/objenesis/tck/CandidateLoaderTest.java) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/objenesis/tck/ObjenesisTest.java (renamed from tck/test/org/objenesis/tck/ObjenesisTest.java) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/objenesis/tck/OsgiTest.java (renamed from tck/test/org/objenesis/tck/OsgiTest.java) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/objenesis/tck/TCKTest.java (renamed from tck/test/org/objenesis/tck/TCKTest.java) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/objenesis/tck/TextReporterTest.java (renamed from tck/test/org/objenesis/tck/TextReporterTest.java) | 0 | ||||
-rw-r--r-- | tck/src/test/java/org/springframework/osgi/test/internal/boot-bundles.properties (renamed from tck/test/org/springframework/osgi/test/internal/boot-bundles.properties) | 0 | ||||
-rw-r--r-- | tck/src/test/resources/org/objenesis/tck/CandidateLoaderTest-sample.properties (renamed from tck/test/org/objenesis/tck/CandidateLoaderTest-sample.properties) | 0 |
73 files changed, 12 insertions, 9 deletions
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) # build for the host JVM #----------------------- include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, main/src) +LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java) LOCAL_MODULE := objenesis-host LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_JAVA_LIBRARY) @@ -27,7 +27,7 @@ include $(BUILD_HOST_JAVA_LIBRARY) # build for host dalvik #----------------------- include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, main/src) +LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java) LOCAL_MODULE := objenesis-hostdex LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) @@ -37,7 +37,7 @@ include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, main/src) +LOCAL_SRC_FILES := $(call all-java-files-under, main/src/main/java) # ideally this should be called just 'objenesis', but that name is # already used by a prebuilt host lib. LOCAL_MODULE := objenesis-target @@ -54,8 +54,8 @@ LOCAL_MODULE := objenesis-tck-target LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := objenesis-target -LOCAL_SRC_FILES := $(call all-java-files-under, tck/src) -LOCAL_JAVA_RESOURCE_DIRS := tck/src +LOCAL_SRC_FILES := $(call all-java-files-under, tck/src/main/java) +LOCAL_JAVA_RESOURCE_DIRS := tck/src/main/resources include $(BUILD_STATIC_JAVA_LIBRARY) include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/README.version b/README.version index 9a974c8..614fcde 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,6 @@ -URL: https://code.google.com/p/objenesis/downloads/detail?name=objenesis-2.0-bin.zip&can=2&q= +URL: https://github.com/easymock/objenesis Version: 2.0 BugComponent: 21001 + +Local Modifications: + None diff --git a/main/src/org/objenesis/Objenesis.java b/main/src/main/java/org/objenesis/Objenesis.java index 8bb29a5..8bb29a5 100644 --- a/main/src/org/objenesis/Objenesis.java +++ b/main/src/main/java/org/objenesis/Objenesis.java diff --git a/main/src/org/objenesis/ObjenesisBase.java b/main/src/main/java/org/objenesis/ObjenesisBase.java index 24bb444..24bb444 100644 --- a/main/src/org/objenesis/ObjenesisBase.java +++ b/main/src/main/java/org/objenesis/ObjenesisBase.java diff --git a/main/src/org/objenesis/ObjenesisException.java b/main/src/main/java/org/objenesis/ObjenesisException.java index f192dbe..f192dbe 100644 --- a/main/src/org/objenesis/ObjenesisException.java +++ b/main/src/main/java/org/objenesis/ObjenesisException.java diff --git a/main/src/org/objenesis/ObjenesisHelper.java b/main/src/main/java/org/objenesis/ObjenesisHelper.java index 2e86305..2e86305 100644 --- a/main/src/org/objenesis/ObjenesisHelper.java +++ b/main/src/main/java/org/objenesis/ObjenesisHelper.java diff --git a/main/src/org/objenesis/ObjenesisSerializer.java b/main/src/main/java/org/objenesis/ObjenesisSerializer.java index 8bb7e8c..8bb7e8c 100644 --- a/main/src/org/objenesis/ObjenesisSerializer.java +++ b/main/src/main/java/org/objenesis/ObjenesisSerializer.java diff --git a/main/src/org/objenesis/ObjenesisStd.java b/main/src/main/java/org/objenesis/ObjenesisStd.java index 2d9b9ba..2d9b9ba 100644 --- a/main/src/org/objenesis/ObjenesisStd.java +++ b/main/src/main/java/org/objenesis/ObjenesisStd.java diff --git a/main/src/org/objenesis/instantiator/NullInstantiator.java b/main/src/main/java/org/objenesis/instantiator/NullInstantiator.java index ab2a44f..ab2a44f 100644 --- a/main/src/org/objenesis/instantiator/NullInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/NullInstantiator.java diff --git a/main/src/org/objenesis/instantiator/ObjectInstantiator.java b/main/src/main/java/org/objenesis/instantiator/ObjectInstantiator.java index 47b1713..47b1713 100644 --- a/main/src/org/objenesis/instantiator/ObjectInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/ObjectInstantiator.java diff --git a/main/src/org/objenesis/instantiator/SerializationInstantiatorHelper.java b/main/src/main/java/org/objenesis/instantiator/SerializationInstantiatorHelper.java index f937979..f937979 100644 --- a/main/src/org/objenesis/instantiator/SerializationInstantiatorHelper.java +++ b/main/src/main/java/org/objenesis/instantiator/SerializationInstantiatorHelper.java diff --git a/main/src/org/objenesis/instantiator/android/AndroidInstantiator.java b/main/src/main/java/org/objenesis/instantiator/android/AndroidInstantiator.java index b3277e6..b3277e6 100644 --- a/main/src/org/objenesis/instantiator/android/AndroidInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/android/AndroidInstantiator.java diff --git a/main/src/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java b/main/src/main/java/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java index 1d9f029..1d9f029 100644 --- a/main/src/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/android/AndroidSerializationInstantiator.java diff --git a/main/src/org/objenesis/instantiator/basic/AccessibleInstantiator.java b/main/src/main/java/org/objenesis/instantiator/basic/AccessibleInstantiator.java index e1b96a4..e1b96a4 100644 --- a/main/src/org/objenesis/instantiator/basic/AccessibleInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/basic/AccessibleInstantiator.java diff --git a/main/src/org/objenesis/instantiator/basic/ConstructorInstantiator.java b/main/src/main/java/org/objenesis/instantiator/basic/ConstructorInstantiator.java index 7db10f5..7db10f5 100644 --- a/main/src/org/objenesis/instantiator/basic/ConstructorInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/basic/ConstructorInstantiator.java diff --git a/main/src/org/objenesis/instantiator/basic/NewInstanceInstantiator.java b/main/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java index e95f0f8..e95f0f8 100644 --- a/main/src/org/objenesis/instantiator/basic/NewInstanceInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/basic/NewInstanceInstantiator.java diff --git a/main/src/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java b/main/src/main/java/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java index 265f813..265f813 100644 --- a/main/src/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java diff --git a/main/src/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java b/main/src/main/java/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java index 742ec5a..742ec5a 100644 --- a/main/src/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java diff --git a/main/src/org/objenesis/instantiator/gcj/GCJInstantiator.java b/main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiator.java index e1180dc..e1180dc 100644 --- a/main/src/org/objenesis/instantiator/gcj/GCJInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiator.java diff --git a/main/src/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java b/main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java index 13bfc90..13bfc90 100644 --- a/main/src/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java +++ b/main/src/main/java/org/objenesis/instantiator/gcj/GCJInstantiatorBase.java diff --git a/main/src/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java b/main/src/main/java/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java index e2c1609..e2c1609 100644 --- a/main/src/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/gcj/GCJSerializationInstantiator.java diff --git a/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java b/main/src/main/java/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java index 7db9652..7db9652 100644 --- a/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java diff --git a/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java b/main/src/main/java/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java index 9050353..9050353 100644 --- a/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java diff --git a/main/src/org/objenesis/instantiator/perc/PercInstantiator.java b/main/src/main/java/org/objenesis/instantiator/perc/PercInstantiator.java index 9777fcc..9777fcc 100644 --- a/main/src/org/objenesis/instantiator/perc/PercInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/perc/PercInstantiator.java diff --git a/main/src/org/objenesis/instantiator/perc/PercSerializationInstantiator.java b/main/src/main/java/org/objenesis/instantiator/perc/PercSerializationInstantiator.java index 8dd8016..8dd8016 100644 --- a/main/src/org/objenesis/instantiator/perc/PercSerializationInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/perc/PercSerializationInstantiator.java diff --git a/main/src/org/objenesis/instantiator/sun/Sun13Instantiator.java b/main/src/main/java/org/objenesis/instantiator/sun/Sun13Instantiator.java index 28c353a..28c353a 100644 --- a/main/src/org/objenesis/instantiator/sun/Sun13Instantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/Sun13Instantiator.java diff --git a/main/src/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java b/main/src/main/java/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java index 13073a1..13073a1 100644 --- a/main/src/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/Sun13InstantiatorBase.java diff --git a/main/src/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java b/main/src/main/java/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java index 9669e57..9669e57 100644 --- a/main/src/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/Sun13SerializationInstantiator.java diff --git a/main/src/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java index 5717b72..5717b72 100644 --- a/main/src/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryHelper.java diff --git a/main/src/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java index fa30448..fa30448 100644 --- a/main/src/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactoryInstantiator.java diff --git a/main/src/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java index e6bb2c8..e6bb2c8 100644 --- a/main/src/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java +++ b/main/src/main/java/org/objenesis/instantiator/sun/SunReflectionFactorySerializationInstantiator.java diff --git a/main/src/org/objenesis/strategy/BaseInstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/BaseInstantiatorStrategy.java index 6161576..6161576 100644 --- a/main/src/org/objenesis/strategy/BaseInstantiatorStrategy.java +++ b/main/src/main/java/org/objenesis/strategy/BaseInstantiatorStrategy.java diff --git a/main/src/org/objenesis/strategy/InstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/InstantiatorStrategy.java index dfaa84e..dfaa84e 100644 --- a/main/src/org/objenesis/strategy/InstantiatorStrategy.java +++ b/main/src/main/java/org/objenesis/strategy/InstantiatorStrategy.java diff --git a/main/src/org/objenesis/strategy/SerializingInstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/SerializingInstantiatorStrategy.java index 1af2d3e..1af2d3e 100644 --- a/main/src/org/objenesis/strategy/SerializingInstantiatorStrategy.java +++ b/main/src/main/java/org/objenesis/strategy/SerializingInstantiatorStrategy.java diff --git a/main/src/org/objenesis/strategy/StdInstantiatorStrategy.java b/main/src/main/java/org/objenesis/strategy/StdInstantiatorStrategy.java index 2b71d9a..2b71d9a 100644 --- a/main/src/org/objenesis/strategy/StdInstantiatorStrategy.java +++ b/main/src/main/java/org/objenesis/strategy/StdInstantiatorStrategy.java diff --git a/main/test/org/objenesis/ObjenesisExceptionTest.java b/main/src/test/java/org/objenesis/ObjenesisExceptionTest.java index 407a2fd..407a2fd 100644 --- a/main/test/org/objenesis/ObjenesisExceptionTest.java +++ b/main/src/test/java/org/objenesis/ObjenesisExceptionTest.java diff --git a/main/test/org/objenesis/ObjenesisTest.java b/main/src/test/java/org/objenesis/ObjenesisTest.java index eddd4a8..eddd4a8 100644 --- a/main/test/org/objenesis/ObjenesisTest.java +++ b/main/src/test/java/org/objenesis/ObjenesisTest.java diff --git a/main/test/org/objenesis/SerializingInstantiatorTest.java b/main/src/test/java/org/objenesis/SerializingInstantiatorTest.java index 7eb5081..7eb5081 100644 --- a/main/test/org/objenesis/SerializingInstantiatorTest.java +++ b/main/src/test/java/org/objenesis/SerializingInstantiatorTest.java diff --git a/tck-android/Android.mk b/tck-android/Android.mk index 7697f47..41752f1 100644 --- a/tck-android/Android.mk +++ b/tck-android/Android.mk @@ -19,8 +19,8 @@ LOCAL_PATH := $(call my-dir) # ------------------------------- # Builds the deployable Objenesis TCK for Android # To build and run: -# make APP-ObjenesisTck -# adb install -r out/target/product/generic/data/app/ObjenesisTck.apk +# make ObjenesisTck +# adb install -r ${ANDROID_PRODUCT_OUT}/data/app/ObjenesisTck/ObjenesisTck.apk # adb shell am instrument -w org.objenesis.tck.android/.TckInstrumentation include $(CLEAR_VARS) @@ -29,5 +29,5 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck-target -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) include $(BUILD_PACKAGE) diff --git a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java index 23ee5cf..23ee5cf 100644 --- a/tck-android/src/org/objenesis/tck/android/TckInstrumentation.java +++ b/tck-android/src/main/java/org/objenesis/tck/android/TckInstrumentation.java diff --git a/tck/src/org/objenesis/tck/CandidateLoader.java b/tck/src/main/java/org/objenesis/tck/CandidateLoader.java index 294fd50..294fd50 100644 --- a/tck/src/org/objenesis/tck/CandidateLoader.java +++ b/tck/src/main/java/org/objenesis/tck/CandidateLoader.java diff --git a/tck/src/org/objenesis/tck/Main.java b/tck/src/main/java/org/objenesis/tck/Main.java index 8634cfb..8634cfb 100644 --- a/tck/src/org/objenesis/tck/Main.java +++ b/tck/src/main/java/org/objenesis/tck/Main.java diff --git a/tck/src/org/objenesis/tck/Reporter.java b/tck/src/main/java/org/objenesis/tck/Reporter.java index a73783d..a73783d 100644 --- a/tck/src/org/objenesis/tck/Reporter.java +++ b/tck/src/main/java/org/objenesis/tck/Reporter.java diff --git a/tck/src/org/objenesis/tck/TCK.java b/tck/src/main/java/org/objenesis/tck/TCK.java index 00046e2..00046e2 100644 --- a/tck/src/org/objenesis/tck/TCK.java +++ b/tck/src/main/java/org/objenesis/tck/TCK.java diff --git a/tck/src/org/objenesis/tck/TextReporter.java b/tck/src/main/java/org/objenesis/tck/TextReporter.java index f83c982..f83c982 100644 --- a/tck/src/org/objenesis/tck/TextReporter.java +++ b/tck/src/main/java/org/objenesis/tck/TextReporter.java diff --git a/tck/src/org/objenesis/tck/candidates/ConstructorThrowingException.java b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorThrowingException.java index 43c3f7f..43c3f7f 100644 --- a/tck/src/org/objenesis/tck/candidates/ConstructorThrowingException.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorThrowingException.java diff --git a/tck/src/org/objenesis/tck/candidates/ConstructorWithArguments.java b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithArguments.java index caebcf3..caebcf3 100644 --- a/tck/src/org/objenesis/tck/candidates/ConstructorWithArguments.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithArguments.java diff --git a/tck/src/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java index 52ae9c4..52ae9c4 100644 --- a/tck/src/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/ConstructorWithMandatoryArguments.java diff --git a/tck/src/org/objenesis/tck/candidates/DefaultPackageConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPackageConstructor.java index 7e05025..7e05025 100644 --- a/tck/src/org/objenesis/tck/candidates/DefaultPackageConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPackageConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/DefaultPrivateConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPrivateConstructor.java index d84a0eb..d84a0eb 100644 --- a/tck/src/org/objenesis/tck/candidates/DefaultPrivateConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPrivateConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/DefaultProtectedConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/DefaultProtectedConstructor.java index e3c665e..e3c665e 100644 --- a/tck/src/org/objenesis/tck/candidates/DefaultProtectedConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/DefaultProtectedConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/DefaultPublicConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPublicConstructor.java index da595f1..da595f1 100644 --- a/tck/src/org/objenesis/tck/candidates/DefaultPublicConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/DefaultPublicConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/NoConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/NoConstructor.java index df6ae4b..df6ae4b 100644 --- a/tck/src/org/objenesis/tck/candidates/NoConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/NoConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java index 4eb3f82..4eb3f82 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorThrowingException.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java index 88006dc..88006dc 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithArguments.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java index e495576..e495576 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableConstructorWithMandatoryArguments.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java index 1147527..1147527 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPackageConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java index 2a93746..2a93746 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPrivateConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java index bb2bc07..bb2bc07 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultProtectedConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java index 0e1c356..0e1c356 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableDefaultPublicConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableNoConstructor.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableNoConstructor.java index d9ee743..d9ee743 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableNoConstructor.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableNoConstructor.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableReplacer.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableReplacer.java index ccfebbf..ccfebbf 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableReplacer.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableReplacer.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableResolver.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableResolver.java index e5f01d4..e5f01d4 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableResolver.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableResolver.java diff --git a/tck/src/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java b/tck/src/main/java/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java index 9a73f78..9a73f78 100644 --- a/tck/src/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java +++ b/tck/src/main/java/org/objenesis/tck/candidates/SerializableWithAncestorThrowingException.java diff --git a/tck/src/org/objenesis/tck/candidates/candidates.properties b/tck/src/main/resources/org/objenesis/tck/candidates/candidates.properties index 146c01d..146c01d 100644 --- a/tck/src/org/objenesis/tck/candidates/candidates.properties +++ b/tck/src/main/resources/org/objenesis/tck/candidates/candidates.properties diff --git a/tck/src/org/objenesis/tck/candidates/serializable-candidates.properties b/tck/src/main/resources/org/objenesis/tck/candidates/serializable-candidates.properties index 33c03ea..33c03ea 100644 --- a/tck/src/org/objenesis/tck/candidates/serializable-candidates.properties +++ b/tck/src/main/resources/org/objenesis/tck/candidates/serializable-candidates.properties diff --git a/tck/test/org/objenesis/tck/CandidateLoaderTest.java b/tck/src/test/java/org/objenesis/tck/CandidateLoaderTest.java index 7c0666b..7c0666b 100644 --- a/tck/test/org/objenesis/tck/CandidateLoaderTest.java +++ b/tck/src/test/java/org/objenesis/tck/CandidateLoaderTest.java diff --git a/tck/test/org/objenesis/tck/ObjenesisTest.java b/tck/src/test/java/org/objenesis/tck/ObjenesisTest.java index 95c3188..95c3188 100644 --- a/tck/test/org/objenesis/tck/ObjenesisTest.java +++ b/tck/src/test/java/org/objenesis/tck/ObjenesisTest.java diff --git a/tck/test/org/objenesis/tck/OsgiTest.java b/tck/src/test/java/org/objenesis/tck/OsgiTest.java index 9679d71..9679d71 100644 --- a/tck/test/org/objenesis/tck/OsgiTest.java +++ b/tck/src/test/java/org/objenesis/tck/OsgiTest.java diff --git a/tck/test/org/objenesis/tck/TCKTest.java b/tck/src/test/java/org/objenesis/tck/TCKTest.java index 89718dd..89718dd 100644 --- a/tck/test/org/objenesis/tck/TCKTest.java +++ b/tck/src/test/java/org/objenesis/tck/TCKTest.java diff --git a/tck/test/org/objenesis/tck/TextReporterTest.java b/tck/src/test/java/org/objenesis/tck/TextReporterTest.java index f42093a..f42093a 100644 --- a/tck/test/org/objenesis/tck/TextReporterTest.java +++ b/tck/src/test/java/org/objenesis/tck/TextReporterTest.java diff --git a/tck/test/org/springframework/osgi/test/internal/boot-bundles.properties b/tck/src/test/java/org/springframework/osgi/test/internal/boot-bundles.properties index 7d19172..7d19172 100644 --- a/tck/test/org/springframework/osgi/test/internal/boot-bundles.properties +++ b/tck/src/test/java/org/springframework/osgi/test/internal/boot-bundles.properties diff --git a/tck/test/org/objenesis/tck/CandidateLoaderTest-sample.properties b/tck/src/test/resources/org/objenesis/tck/CandidateLoaderTest-sample.properties index 14f8a6b..14f8a6b 100644 --- a/tck/test/org/objenesis/tck/CandidateLoaderTest-sample.properties +++ b/tck/src/test/resources/org/objenesis/tck/CandidateLoaderTest-sample.properties |