Merge "Remove reference to deleted file Common.mk"
diff --git a/Android.mk b/Android.mk
index 8205fc4..b9171db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
# build a junit jar
# ----------------------
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := 25
@@ -33,7 +33,7 @@
# ----------------------
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit-host
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host
@@ -45,7 +45,7 @@
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
LOCAL_MODULE := junit-hostdex
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
diff --git a/build.gradle b/build.gradle
index 722846c..af619ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,13 +9,13 @@
sourceSets {
host {
java {
- srcDirs = ['src']
+ srcDirs = ['src/main/java']
}
}
target {
java {
- srcDirs = ['src']
+ srcDirs = ['src/main/java']
include 'org/**',
'junit/extensions/**',
// remove these packages since they are in android.test.runner
diff --git a/src/junit/extensions/ActiveTestSuite.java b/src/main/java/junit/extensions/ActiveTestSuite.java
similarity index 100%
rename from src/junit/extensions/ActiveTestSuite.java
rename to src/main/java/junit/extensions/ActiveTestSuite.java
diff --git a/src/junit/extensions/RepeatedTest.java b/src/main/java/junit/extensions/RepeatedTest.java
similarity index 100%
rename from src/junit/extensions/RepeatedTest.java
rename to src/main/java/junit/extensions/RepeatedTest.java
diff --git a/src/junit/extensions/TestDecorator.java b/src/main/java/junit/extensions/TestDecorator.java
similarity index 100%
rename from src/junit/extensions/TestDecorator.java
rename to src/main/java/junit/extensions/TestDecorator.java
diff --git a/src/junit/extensions/TestSetup.java b/src/main/java/junit/extensions/TestSetup.java
similarity index 100%
rename from src/junit/extensions/TestSetup.java
rename to src/main/java/junit/extensions/TestSetup.java
diff --git a/src/junit/extensions/package-info.java b/src/main/java/junit/extensions/package-info.java
similarity index 100%
rename from src/junit/extensions/package-info.java
rename to src/main/java/junit/extensions/package-info.java
diff --git a/src/junit/framework/Assert.java b/src/main/java/junit/framework/Assert.java
similarity index 100%
rename from src/junit/framework/Assert.java
rename to src/main/java/junit/framework/Assert.java
diff --git a/src/junit/framework/AssertionFailedError.java b/src/main/java/junit/framework/AssertionFailedError.java
similarity index 100%
rename from src/junit/framework/AssertionFailedError.java
rename to src/main/java/junit/framework/AssertionFailedError.java
diff --git a/src/junit/framework/ComparisonCompactor.java b/src/main/java/junit/framework/ComparisonCompactor.java
similarity index 100%
rename from src/junit/framework/ComparisonCompactor.java
rename to src/main/java/junit/framework/ComparisonCompactor.java
diff --git a/src/junit/framework/ComparisonFailure.java b/src/main/java/junit/framework/ComparisonFailure.java
similarity index 100%
rename from src/junit/framework/ComparisonFailure.java
rename to src/main/java/junit/framework/ComparisonFailure.java
diff --git a/src/junit/framework/JUnit4TestAdapter.java b/src/main/java/junit/framework/JUnit4TestAdapter.java
similarity index 100%
rename from src/junit/framework/JUnit4TestAdapter.java
rename to src/main/java/junit/framework/JUnit4TestAdapter.java
diff --git a/src/junit/framework/JUnit4TestAdapterCache.java b/src/main/java/junit/framework/JUnit4TestAdapterCache.java
similarity index 100%
rename from src/junit/framework/JUnit4TestAdapterCache.java
rename to src/main/java/junit/framework/JUnit4TestAdapterCache.java
diff --git a/src/junit/framework/JUnit4TestCaseFacade.java b/src/main/java/junit/framework/JUnit4TestCaseFacade.java
similarity index 100%
rename from src/junit/framework/JUnit4TestCaseFacade.java
rename to src/main/java/junit/framework/JUnit4TestCaseFacade.java
diff --git a/src/junit/framework/Protectable.java b/src/main/java/junit/framework/Protectable.java
similarity index 100%
rename from src/junit/framework/Protectable.java
rename to src/main/java/junit/framework/Protectable.java
diff --git a/src/junit/framework/Test.java b/src/main/java/junit/framework/Test.java
similarity index 100%
rename from src/junit/framework/Test.java
rename to src/main/java/junit/framework/Test.java
diff --git a/src/junit/framework/TestCase.java b/src/main/java/junit/framework/TestCase.java
similarity index 100%
rename from src/junit/framework/TestCase.java
rename to src/main/java/junit/framework/TestCase.java
diff --git a/src/junit/framework/TestFailure.java b/src/main/java/junit/framework/TestFailure.java
similarity index 100%
rename from src/junit/framework/TestFailure.java
rename to src/main/java/junit/framework/TestFailure.java
diff --git a/src/junit/framework/TestListener.java b/src/main/java/junit/framework/TestListener.java
similarity index 100%
rename from src/junit/framework/TestListener.java
rename to src/main/java/junit/framework/TestListener.java
diff --git a/src/junit/framework/TestResult.java b/src/main/java/junit/framework/TestResult.java
similarity index 100%
rename from src/junit/framework/TestResult.java
rename to src/main/java/junit/framework/TestResult.java
diff --git a/src/junit/framework/TestSuite.java b/src/main/java/junit/framework/TestSuite.java
similarity index 100%
rename from src/junit/framework/TestSuite.java
rename to src/main/java/junit/framework/TestSuite.java
diff --git a/src/junit/framework/package-info.java b/src/main/java/junit/framework/package-info.java
similarity index 100%
rename from src/junit/framework/package-info.java
rename to src/main/java/junit/framework/package-info.java
diff --git a/src/junit/runner/BaseTestRunner.java b/src/main/java/junit/runner/BaseTestRunner.java
similarity index 100%
rename from src/junit/runner/BaseTestRunner.java
rename to src/main/java/junit/runner/BaseTestRunner.java
diff --git a/src/junit/runner/TestRunListener.java b/src/main/java/junit/runner/TestRunListener.java
similarity index 100%
rename from src/junit/runner/TestRunListener.java
rename to src/main/java/junit/runner/TestRunListener.java
diff --git a/src/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
similarity index 100%
rename from src/junit/runner/Version.java
rename to src/main/java/junit/runner/Version.java
diff --git a/src/junit/runner/Version.java.template b/src/main/java/junit/runner/Version.java.template
similarity index 100%
rename from src/junit/runner/Version.java.template
rename to src/main/java/junit/runner/Version.java.template
diff --git a/src/junit/runner/logo.gif b/src/main/java/junit/runner/logo.gif
similarity index 100%
rename from src/junit/runner/logo.gif
rename to src/main/java/junit/runner/logo.gif
Binary files differ
diff --git a/src/junit/runner/package-info.java b/src/main/java/junit/runner/package-info.java
similarity index 100%
rename from src/junit/runner/package-info.java
rename to src/main/java/junit/runner/package-info.java
diff --git a/src/junit/runner/smalllogo.gif b/src/main/java/junit/runner/smalllogo.gif
similarity index 100%
rename from src/junit/runner/smalllogo.gif
rename to src/main/java/junit/runner/smalllogo.gif
Binary files differ
diff --git a/src/junit/textui/ResultPrinter.java b/src/main/java/junit/textui/ResultPrinter.java
similarity index 100%
rename from src/junit/textui/ResultPrinter.java
rename to src/main/java/junit/textui/ResultPrinter.java
diff --git a/src/junit/textui/TestRunner.java b/src/main/java/junit/textui/TestRunner.java
similarity index 100%
rename from src/junit/textui/TestRunner.java
rename to src/main/java/junit/textui/TestRunner.java
diff --git a/src/junit/textui/package-info.java b/src/main/java/junit/textui/package-info.java
similarity index 100%
rename from src/junit/textui/package-info.java
rename to src/main/java/junit/textui/package-info.java
diff --git a/src/org/junit/After.java b/src/main/java/org/junit/After.java
similarity index 100%
rename from src/org/junit/After.java
rename to src/main/java/org/junit/After.java
diff --git a/src/org/junit/AfterClass.java b/src/main/java/org/junit/AfterClass.java
similarity index 100%
rename from src/org/junit/AfterClass.java
rename to src/main/java/org/junit/AfterClass.java
diff --git a/src/org/junit/Assert.java b/src/main/java/org/junit/Assert.java
similarity index 100%
rename from src/org/junit/Assert.java
rename to src/main/java/org/junit/Assert.java
diff --git a/src/org/junit/Assume.java b/src/main/java/org/junit/Assume.java
similarity index 100%
rename from src/org/junit/Assume.java
rename to src/main/java/org/junit/Assume.java
diff --git a/src/org/junit/Before.java b/src/main/java/org/junit/Before.java
similarity index 100%
rename from src/org/junit/Before.java
rename to src/main/java/org/junit/Before.java
diff --git a/src/org/junit/BeforeClass.java b/src/main/java/org/junit/BeforeClass.java
similarity index 100%
rename from src/org/junit/BeforeClass.java
rename to src/main/java/org/junit/BeforeClass.java
diff --git a/src/org/junit/ClassRule.java b/src/main/java/org/junit/ClassRule.java
similarity index 100%
rename from src/org/junit/ClassRule.java
rename to src/main/java/org/junit/ClassRule.java
diff --git a/src/org/junit/ComparisonFailure.java b/src/main/java/org/junit/ComparisonFailure.java
similarity index 100%
rename from src/org/junit/ComparisonFailure.java
rename to src/main/java/org/junit/ComparisonFailure.java
diff --git a/src/org/junit/Ignore.java b/src/main/java/org/junit/Ignore.java
similarity index 100%
rename from src/org/junit/Ignore.java
rename to src/main/java/org/junit/Ignore.java
diff --git a/src/org/junit/Rule.java b/src/main/java/org/junit/Rule.java
similarity index 100%
rename from src/org/junit/Rule.java
rename to src/main/java/org/junit/Rule.java
diff --git a/src/org/junit/Test.java b/src/main/java/org/junit/Test.java
similarity index 100%
rename from src/org/junit/Test.java
rename to src/main/java/org/junit/Test.java
diff --git a/src/org/junit/experimental/ParallelComputer.java b/src/main/java/org/junit/experimental/ParallelComputer.java
similarity index 100%
rename from src/org/junit/experimental/ParallelComputer.java
rename to src/main/java/org/junit/experimental/ParallelComputer.java
diff --git a/src/org/junit/experimental/categories/Categories.java b/src/main/java/org/junit/experimental/categories/Categories.java
similarity index 100%
rename from src/org/junit/experimental/categories/Categories.java
rename to src/main/java/org/junit/experimental/categories/Categories.java
diff --git a/src/org/junit/experimental/categories/Category.java b/src/main/java/org/junit/experimental/categories/Category.java
similarity index 100%
rename from src/org/junit/experimental/categories/Category.java
rename to src/main/java/org/junit/experimental/categories/Category.java
diff --git a/src/org/junit/experimental/max/CouldNotReadCoreException.java b/src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java
similarity index 100%
rename from src/org/junit/experimental/max/CouldNotReadCoreException.java
rename to src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java
diff --git a/src/org/junit/experimental/max/MaxCore.java b/src/main/java/org/junit/experimental/max/MaxCore.java
similarity index 100%
rename from src/org/junit/experimental/max/MaxCore.java
rename to src/main/java/org/junit/experimental/max/MaxCore.java
diff --git a/src/org/junit/experimental/max/MaxHistory.java b/src/main/java/org/junit/experimental/max/MaxHistory.java
similarity index 100%
rename from src/org/junit/experimental/max/MaxHistory.java
rename to src/main/java/org/junit/experimental/max/MaxHistory.java
diff --git a/src/org/junit/experimental/results/FailureList.java b/src/main/java/org/junit/experimental/results/FailureList.java
similarity index 100%
rename from src/org/junit/experimental/results/FailureList.java
rename to src/main/java/org/junit/experimental/results/FailureList.java
diff --git a/src/org/junit/experimental/results/PrintableResult.java b/src/main/java/org/junit/experimental/results/PrintableResult.java
similarity index 100%
rename from src/org/junit/experimental/results/PrintableResult.java
rename to src/main/java/org/junit/experimental/results/PrintableResult.java
diff --git a/src/org/junit/experimental/results/ResultMatchers.java b/src/main/java/org/junit/experimental/results/ResultMatchers.java
similarity index 100%
rename from src/org/junit/experimental/results/ResultMatchers.java
rename to src/main/java/org/junit/experimental/results/ResultMatchers.java
diff --git a/src/org/junit/experimental/runners/Enclosed.java b/src/main/java/org/junit/experimental/runners/Enclosed.java
similarity index 100%
rename from src/org/junit/experimental/runners/Enclosed.java
rename to src/main/java/org/junit/experimental/runners/Enclosed.java
diff --git a/src/org/junit/experimental/theories/DataPoint.java b/src/main/java/org/junit/experimental/theories/DataPoint.java
similarity index 100%
rename from src/org/junit/experimental/theories/DataPoint.java
rename to src/main/java/org/junit/experimental/theories/DataPoint.java
diff --git a/src/org/junit/experimental/theories/DataPoints.java b/src/main/java/org/junit/experimental/theories/DataPoints.java
similarity index 100%
rename from src/org/junit/experimental/theories/DataPoints.java
rename to src/main/java/org/junit/experimental/theories/DataPoints.java
diff --git a/src/org/junit/experimental/theories/ParameterSignature.java b/src/main/java/org/junit/experimental/theories/ParameterSignature.java
similarity index 100%
rename from src/org/junit/experimental/theories/ParameterSignature.java
rename to src/main/java/org/junit/experimental/theories/ParameterSignature.java
diff --git a/src/org/junit/experimental/theories/ParameterSupplier.java b/src/main/java/org/junit/experimental/theories/ParameterSupplier.java
similarity index 100%
rename from src/org/junit/experimental/theories/ParameterSupplier.java
rename to src/main/java/org/junit/experimental/theories/ParameterSupplier.java
diff --git a/src/org/junit/experimental/theories/ParametersSuppliedBy.java b/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java
similarity index 100%
rename from src/org/junit/experimental/theories/ParametersSuppliedBy.java
rename to src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java
diff --git a/src/org/junit/experimental/theories/PotentialAssignment.java b/src/main/java/org/junit/experimental/theories/PotentialAssignment.java
similarity index 100%
rename from src/org/junit/experimental/theories/PotentialAssignment.java
rename to src/main/java/org/junit/experimental/theories/PotentialAssignment.java
diff --git a/src/org/junit/experimental/theories/Theories.java b/src/main/java/org/junit/experimental/theories/Theories.java
similarity index 100%
rename from src/org/junit/experimental/theories/Theories.java
rename to src/main/java/org/junit/experimental/theories/Theories.java
diff --git a/src/org/junit/experimental/theories/Theory.java b/src/main/java/org/junit/experimental/theories/Theory.java
similarity index 100%
rename from src/org/junit/experimental/theories/Theory.java
rename to src/main/java/org/junit/experimental/theories/Theory.java
diff --git a/src/org/junit/experimental/theories/internal/AllMembersSupplier.java b/src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java
similarity index 100%
rename from src/org/junit/experimental/theories/internal/AllMembersSupplier.java
rename to src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java
diff --git a/src/org/junit/experimental/theories/internal/Assignments.java b/src/main/java/org/junit/experimental/theories/internal/Assignments.java
similarity index 100%
rename from src/org/junit/experimental/theories/internal/Assignments.java
rename to src/main/java/org/junit/experimental/theories/internal/Assignments.java
diff --git a/src/org/junit/experimental/theories/internal/ParameterizedAssertionError.java b/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
similarity index 100%
rename from src/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
rename to src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java
diff --git a/src/org/junit/experimental/theories/suppliers/TestedOn.java b/src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java
similarity index 100%
rename from src/org/junit/experimental/theories/suppliers/TestedOn.java
rename to src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java
diff --git a/src/org/junit/experimental/theories/suppliers/TestedOnSupplier.java b/src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
similarity index 100%
rename from src/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
rename to src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java
diff --git a/src/org/junit/internal/ArrayComparisonFailure.java b/src/main/java/org/junit/internal/ArrayComparisonFailure.java
similarity index 100%
rename from src/org/junit/internal/ArrayComparisonFailure.java
rename to src/main/java/org/junit/internal/ArrayComparisonFailure.java
diff --git a/src/org/junit/internal/AssumptionViolatedException.java b/src/main/java/org/junit/internal/AssumptionViolatedException.java
similarity index 100%
rename from src/org/junit/internal/AssumptionViolatedException.java
rename to src/main/java/org/junit/internal/AssumptionViolatedException.java
diff --git a/src/org/junit/internal/ComparisonCriteria.java b/src/main/java/org/junit/internal/ComparisonCriteria.java
similarity index 100%
rename from src/org/junit/internal/ComparisonCriteria.java
rename to src/main/java/org/junit/internal/ComparisonCriteria.java
diff --git a/src/org/junit/internal/ExactComparisonCriteria.java b/src/main/java/org/junit/internal/ExactComparisonCriteria.java
similarity index 100%
rename from src/org/junit/internal/ExactComparisonCriteria.java
rename to src/main/java/org/junit/internal/ExactComparisonCriteria.java
diff --git a/src/org/junit/internal/InexactComparisonCriteria.java b/src/main/java/org/junit/internal/InexactComparisonCriteria.java
similarity index 100%
rename from src/org/junit/internal/InexactComparisonCriteria.java
rename to src/main/java/org/junit/internal/InexactComparisonCriteria.java
diff --git a/src/org/junit/internal/JUnitSystem.java b/src/main/java/org/junit/internal/JUnitSystem.java
similarity index 100%
rename from src/org/junit/internal/JUnitSystem.java
rename to src/main/java/org/junit/internal/JUnitSystem.java
diff --git a/src/org/junit/internal/RealSystem.java b/src/main/java/org/junit/internal/RealSystem.java
similarity index 100%
rename from src/org/junit/internal/RealSystem.java
rename to src/main/java/org/junit/internal/RealSystem.java
diff --git a/src/org/junit/internal/TextListener.java b/src/main/java/org/junit/internal/TextListener.java
similarity index 100%
rename from src/org/junit/internal/TextListener.java
rename to src/main/java/org/junit/internal/TextListener.java
diff --git a/src/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java b/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
similarity index 100%
rename from src/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
rename to src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
diff --git a/src/org/junit/internal/builders/AnnotatedBuilder.java b/src/main/java/org/junit/internal/builders/AnnotatedBuilder.java
similarity index 100%
rename from src/org/junit/internal/builders/AnnotatedBuilder.java
rename to src/main/java/org/junit/internal/builders/AnnotatedBuilder.java
diff --git a/src/org/junit/internal/builders/IgnoredBuilder.java b/src/main/java/org/junit/internal/builders/IgnoredBuilder.java
similarity index 100%
rename from src/org/junit/internal/builders/IgnoredBuilder.java
rename to src/main/java/org/junit/internal/builders/IgnoredBuilder.java
diff --git a/src/org/junit/internal/builders/IgnoredClassRunner.java b/src/main/java/org/junit/internal/builders/IgnoredClassRunner.java
similarity index 100%
rename from src/org/junit/internal/builders/IgnoredClassRunner.java
rename to src/main/java/org/junit/internal/builders/IgnoredClassRunner.java
diff --git a/src/org/junit/internal/builders/JUnit3Builder.java b/src/main/java/org/junit/internal/builders/JUnit3Builder.java
similarity index 100%
rename from src/org/junit/internal/builders/JUnit3Builder.java
rename to src/main/java/org/junit/internal/builders/JUnit3Builder.java
diff --git a/src/org/junit/internal/builders/JUnit4Builder.java b/src/main/java/org/junit/internal/builders/JUnit4Builder.java
similarity index 100%
rename from src/org/junit/internal/builders/JUnit4Builder.java
rename to src/main/java/org/junit/internal/builders/JUnit4Builder.java
diff --git a/src/org/junit/internal/builders/NullBuilder.java b/src/main/java/org/junit/internal/builders/NullBuilder.java
similarity index 100%
rename from src/org/junit/internal/builders/NullBuilder.java
rename to src/main/java/org/junit/internal/builders/NullBuilder.java
diff --git a/src/org/junit/internal/builders/SuiteMethodBuilder.java b/src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java
similarity index 100%
rename from src/org/junit/internal/builders/SuiteMethodBuilder.java
rename to src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java
diff --git a/src/org/junit/internal/matchers/CombinableMatcher.java b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java
similarity index 100%
rename from src/org/junit/internal/matchers/CombinableMatcher.java
rename to src/main/java/org/junit/internal/matchers/CombinableMatcher.java
diff --git a/src/org/junit/internal/matchers/Each.java b/src/main/java/org/junit/internal/matchers/Each.java
similarity index 100%
rename from src/org/junit/internal/matchers/Each.java
rename to src/main/java/org/junit/internal/matchers/Each.java
diff --git a/src/org/junit/internal/matchers/IsCollectionContaining.java b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
similarity index 100%
rename from src/org/junit/internal/matchers/IsCollectionContaining.java
rename to src/main/java/org/junit/internal/matchers/IsCollectionContaining.java
diff --git a/src/org/junit/internal/matchers/StringContains.java b/src/main/java/org/junit/internal/matchers/StringContains.java
similarity index 100%
rename from src/org/junit/internal/matchers/StringContains.java
rename to src/main/java/org/junit/internal/matchers/StringContains.java
diff --git a/src/org/junit/internal/matchers/SubstringMatcher.java b/src/main/java/org/junit/internal/matchers/SubstringMatcher.java
similarity index 100%
rename from src/org/junit/internal/matchers/SubstringMatcher.java
rename to src/main/java/org/junit/internal/matchers/SubstringMatcher.java
diff --git a/src/org/junit/internal/matchers/TypeSafeMatcher.java b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java
similarity index 100%
rename from src/org/junit/internal/matchers/TypeSafeMatcher.java
rename to src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java
diff --git a/src/org/junit/internal/requests/ClassRequest.java b/src/main/java/org/junit/internal/requests/ClassRequest.java
similarity index 100%
rename from src/org/junit/internal/requests/ClassRequest.java
rename to src/main/java/org/junit/internal/requests/ClassRequest.java
diff --git a/src/org/junit/internal/requests/FilterRequest.java b/src/main/java/org/junit/internal/requests/FilterRequest.java
similarity index 100%
rename from src/org/junit/internal/requests/FilterRequest.java
rename to src/main/java/org/junit/internal/requests/FilterRequest.java
diff --git a/src/org/junit/internal/requests/SortingRequest.java b/src/main/java/org/junit/internal/requests/SortingRequest.java
similarity index 100%
rename from src/org/junit/internal/requests/SortingRequest.java
rename to src/main/java/org/junit/internal/requests/SortingRequest.java
diff --git a/src/org/junit/internal/requests/package-info.java b/src/main/java/org/junit/internal/requests/package-info.java
similarity index 100%
rename from src/org/junit/internal/requests/package-info.java
rename to src/main/java/org/junit/internal/requests/package-info.java
diff --git a/src/org/junit/internal/runners/ClassRoadie.java b/src/main/java/org/junit/internal/runners/ClassRoadie.java
similarity index 100%
rename from src/org/junit/internal/runners/ClassRoadie.java
rename to src/main/java/org/junit/internal/runners/ClassRoadie.java
diff --git a/src/org/junit/internal/runners/ErrorReportingRunner.java b/src/main/java/org/junit/internal/runners/ErrorReportingRunner.java
similarity index 100%
rename from src/org/junit/internal/runners/ErrorReportingRunner.java
rename to src/main/java/org/junit/internal/runners/ErrorReportingRunner.java
diff --git a/src/org/junit/internal/runners/FailedBefore.java b/src/main/java/org/junit/internal/runners/FailedBefore.java
similarity index 100%
rename from src/org/junit/internal/runners/FailedBefore.java
rename to src/main/java/org/junit/internal/runners/FailedBefore.java
diff --git a/src/org/junit/internal/runners/InitializationError.java b/src/main/java/org/junit/internal/runners/InitializationError.java
similarity index 100%
rename from src/org/junit/internal/runners/InitializationError.java
rename to src/main/java/org/junit/internal/runners/InitializationError.java
diff --git a/src/org/junit/internal/runners/JUnit38ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
similarity index 100%
rename from src/org/junit/internal/runners/JUnit38ClassRunner.java
rename to src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
diff --git a/src/org/junit/internal/runners/JUnit4ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit4ClassRunner.java
similarity index 100%
rename from src/org/junit/internal/runners/JUnit4ClassRunner.java
rename to src/main/java/org/junit/internal/runners/JUnit4ClassRunner.java
diff --git a/src/org/junit/internal/runners/MethodRoadie.java b/src/main/java/org/junit/internal/runners/MethodRoadie.java
similarity index 100%
rename from src/org/junit/internal/runners/MethodRoadie.java
rename to src/main/java/org/junit/internal/runners/MethodRoadie.java
diff --git a/src/org/junit/internal/runners/MethodValidator.java b/src/main/java/org/junit/internal/runners/MethodValidator.java
similarity index 100%
rename from src/org/junit/internal/runners/MethodValidator.java
rename to src/main/java/org/junit/internal/runners/MethodValidator.java
diff --git a/src/org/junit/internal/runners/SuiteMethod.java b/src/main/java/org/junit/internal/runners/SuiteMethod.java
similarity index 100%
rename from src/org/junit/internal/runners/SuiteMethod.java
rename to src/main/java/org/junit/internal/runners/SuiteMethod.java
diff --git a/src/org/junit/internal/runners/TestClass.java b/src/main/java/org/junit/internal/runners/TestClass.java
similarity index 100%
rename from src/org/junit/internal/runners/TestClass.java
rename to src/main/java/org/junit/internal/runners/TestClass.java
diff --git a/src/org/junit/internal/runners/TestMethod.java b/src/main/java/org/junit/internal/runners/TestMethod.java
similarity index 100%
rename from src/org/junit/internal/runners/TestMethod.java
rename to src/main/java/org/junit/internal/runners/TestMethod.java
diff --git a/src/org/junit/internal/runners/model/EachTestNotifier.java b/src/main/java/org/junit/internal/runners/model/EachTestNotifier.java
similarity index 100%
rename from src/org/junit/internal/runners/model/EachTestNotifier.java
rename to src/main/java/org/junit/internal/runners/model/EachTestNotifier.java
diff --git a/src/org/junit/internal/runners/model/MultipleFailureException.java b/src/main/java/org/junit/internal/runners/model/MultipleFailureException.java
similarity index 100%
rename from src/org/junit/internal/runners/model/MultipleFailureException.java
rename to src/main/java/org/junit/internal/runners/model/MultipleFailureException.java
diff --git a/src/org/junit/internal/runners/model/ReflectiveCallable.java b/src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java
similarity index 100%
rename from src/org/junit/internal/runners/model/ReflectiveCallable.java
rename to src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java
diff --git a/src/org/junit/internal/runners/package-info.java b/src/main/java/org/junit/internal/runners/package-info.java
similarity index 100%
rename from src/org/junit/internal/runners/package-info.java
rename to src/main/java/org/junit/internal/runners/package-info.java
diff --git a/src/org/junit/internal/runners/rules/RuleFieldValidator.java b/src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java
similarity index 100%
rename from src/org/junit/internal/runners/rules/RuleFieldValidator.java
rename to src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java
diff --git a/src/org/junit/internal/runners/statements/ExpectException.java b/src/main/java/org/junit/internal/runners/statements/ExpectException.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/ExpectException.java
rename to src/main/java/org/junit/internal/runners/statements/ExpectException.java
diff --git a/src/org/junit/internal/runners/statements/Fail.java b/src/main/java/org/junit/internal/runners/statements/Fail.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/Fail.java
rename to src/main/java/org/junit/internal/runners/statements/Fail.java
diff --git a/src/org/junit/internal/runners/statements/FailOnTimeout.java b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/FailOnTimeout.java
rename to src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
diff --git a/src/org/junit/internal/runners/statements/InvokeMethod.java b/src/main/java/org/junit/internal/runners/statements/InvokeMethod.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/InvokeMethod.java
rename to src/main/java/org/junit/internal/runners/statements/InvokeMethod.java
diff --git a/src/org/junit/internal/runners/statements/RunAfters.java b/src/main/java/org/junit/internal/runners/statements/RunAfters.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/RunAfters.java
rename to src/main/java/org/junit/internal/runners/statements/RunAfters.java
diff --git a/src/org/junit/internal/runners/statements/RunBefores.java b/src/main/java/org/junit/internal/runners/statements/RunBefores.java
similarity index 100%
rename from src/org/junit/internal/runners/statements/RunBefores.java
rename to src/main/java/org/junit/internal/runners/statements/RunBefores.java
diff --git a/src/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
similarity index 100%
rename from src/org/junit/matchers/JUnitMatchers.java
rename to src/main/java/org/junit/matchers/JUnitMatchers.java
diff --git a/src/org/junit/matchers/package-info.java b/src/main/java/org/junit/matchers/package-info.java
similarity index 100%
rename from src/org/junit/matchers/package-info.java
rename to src/main/java/org/junit/matchers/package-info.java
diff --git a/src/org/junit/package-info.java b/src/main/java/org/junit/package-info.java
similarity index 100%
rename from src/org/junit/package-info.java
rename to src/main/java/org/junit/package-info.java
diff --git a/src/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java
similarity index 100%
rename from src/org/junit/rules/ErrorCollector.java
rename to src/main/java/org/junit/rules/ErrorCollector.java
diff --git a/src/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java
similarity index 100%
rename from src/org/junit/rules/ExpectedException.java
rename to src/main/java/org/junit/rules/ExpectedException.java
diff --git a/src/org/junit/rules/ExternalResource.java b/src/main/java/org/junit/rules/ExternalResource.java
similarity index 100%
rename from src/org/junit/rules/ExternalResource.java
rename to src/main/java/org/junit/rules/ExternalResource.java
diff --git a/src/org/junit/rules/MethodRule.java b/src/main/java/org/junit/rules/MethodRule.java
similarity index 100%
rename from src/org/junit/rules/MethodRule.java
rename to src/main/java/org/junit/rules/MethodRule.java
diff --git a/src/org/junit/rules/RuleChain.java b/src/main/java/org/junit/rules/RuleChain.java
similarity index 100%
rename from src/org/junit/rules/RuleChain.java
rename to src/main/java/org/junit/rules/RuleChain.java
diff --git a/src/org/junit/rules/RunRules.java b/src/main/java/org/junit/rules/RunRules.java
similarity index 100%
rename from src/org/junit/rules/RunRules.java
rename to src/main/java/org/junit/rules/RunRules.java
diff --git a/src/org/junit/rules/TemporaryFolder.java b/src/main/java/org/junit/rules/TemporaryFolder.java
similarity index 100%
rename from src/org/junit/rules/TemporaryFolder.java
rename to src/main/java/org/junit/rules/TemporaryFolder.java
diff --git a/src/org/junit/rules/TestName.java b/src/main/java/org/junit/rules/TestName.java
similarity index 100%
rename from src/org/junit/rules/TestName.java
rename to src/main/java/org/junit/rules/TestName.java
diff --git a/src/org/junit/rules/TestRule.java b/src/main/java/org/junit/rules/TestRule.java
similarity index 100%
rename from src/org/junit/rules/TestRule.java
rename to src/main/java/org/junit/rules/TestRule.java
diff --git a/src/org/junit/rules/TestWatcher.java b/src/main/java/org/junit/rules/TestWatcher.java
similarity index 100%
rename from src/org/junit/rules/TestWatcher.java
rename to src/main/java/org/junit/rules/TestWatcher.java
diff --git a/src/org/junit/rules/TestWatchman.java b/src/main/java/org/junit/rules/TestWatchman.java
similarity index 100%
rename from src/org/junit/rules/TestWatchman.java
rename to src/main/java/org/junit/rules/TestWatchman.java
diff --git a/src/org/junit/rules/Timeout.java b/src/main/java/org/junit/rules/Timeout.java
similarity index 100%
rename from src/org/junit/rules/Timeout.java
rename to src/main/java/org/junit/rules/Timeout.java
diff --git a/src/org/junit/rules/Verifier.java b/src/main/java/org/junit/rules/Verifier.java
similarity index 100%
rename from src/org/junit/rules/Verifier.java
rename to src/main/java/org/junit/rules/Verifier.java
diff --git a/src/org/junit/runner/Computer.java b/src/main/java/org/junit/runner/Computer.java
similarity index 100%
rename from src/org/junit/runner/Computer.java
rename to src/main/java/org/junit/runner/Computer.java
diff --git a/src/org/junit/runner/Describable.java b/src/main/java/org/junit/runner/Describable.java
similarity index 100%
rename from src/org/junit/runner/Describable.java
rename to src/main/java/org/junit/runner/Describable.java
diff --git a/src/org/junit/runner/Description.java b/src/main/java/org/junit/runner/Description.java
similarity index 100%
rename from src/org/junit/runner/Description.java
rename to src/main/java/org/junit/runner/Description.java
diff --git a/src/org/junit/runner/JUnitCore.java b/src/main/java/org/junit/runner/JUnitCore.java
similarity index 100%
rename from src/org/junit/runner/JUnitCore.java
rename to src/main/java/org/junit/runner/JUnitCore.java
diff --git a/src/org/junit/runner/Request.java b/src/main/java/org/junit/runner/Request.java
similarity index 100%
rename from src/org/junit/runner/Request.java
rename to src/main/java/org/junit/runner/Request.java
diff --git a/src/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java
similarity index 100%
rename from src/org/junit/runner/Result.java
rename to src/main/java/org/junit/runner/Result.java
diff --git a/src/org/junit/runner/RunWith.java b/src/main/java/org/junit/runner/RunWith.java
similarity index 100%
rename from src/org/junit/runner/RunWith.java
rename to src/main/java/org/junit/runner/RunWith.java
diff --git a/src/org/junit/runner/Runner.java b/src/main/java/org/junit/runner/Runner.java
similarity index 100%
rename from src/org/junit/runner/Runner.java
rename to src/main/java/org/junit/runner/Runner.java
diff --git a/src/org/junit/runner/manipulation/Filter.java b/src/main/java/org/junit/runner/manipulation/Filter.java
similarity index 100%
rename from src/org/junit/runner/manipulation/Filter.java
rename to src/main/java/org/junit/runner/manipulation/Filter.java
diff --git a/src/org/junit/runner/manipulation/Filterable.java b/src/main/java/org/junit/runner/manipulation/Filterable.java
similarity index 100%
rename from src/org/junit/runner/manipulation/Filterable.java
rename to src/main/java/org/junit/runner/manipulation/Filterable.java
diff --git a/src/org/junit/runner/manipulation/NoTestsRemainException.java b/src/main/java/org/junit/runner/manipulation/NoTestsRemainException.java
similarity index 100%
rename from src/org/junit/runner/manipulation/NoTestsRemainException.java
rename to src/main/java/org/junit/runner/manipulation/NoTestsRemainException.java
diff --git a/src/org/junit/runner/manipulation/Sortable.java b/src/main/java/org/junit/runner/manipulation/Sortable.java
similarity index 100%
rename from src/org/junit/runner/manipulation/Sortable.java
rename to src/main/java/org/junit/runner/manipulation/Sortable.java
diff --git a/src/org/junit/runner/manipulation/Sorter.java b/src/main/java/org/junit/runner/manipulation/Sorter.java
similarity index 100%
rename from src/org/junit/runner/manipulation/Sorter.java
rename to src/main/java/org/junit/runner/manipulation/Sorter.java
diff --git a/src/org/junit/runner/manipulation/package-info.java b/src/main/java/org/junit/runner/manipulation/package-info.java
similarity index 100%
rename from src/org/junit/runner/manipulation/package-info.java
rename to src/main/java/org/junit/runner/manipulation/package-info.java
diff --git a/src/org/junit/runner/notification/Failure.java b/src/main/java/org/junit/runner/notification/Failure.java
similarity index 100%
rename from src/org/junit/runner/notification/Failure.java
rename to src/main/java/org/junit/runner/notification/Failure.java
diff --git a/src/org/junit/runner/notification/RunListener.java b/src/main/java/org/junit/runner/notification/RunListener.java
similarity index 100%
rename from src/org/junit/runner/notification/RunListener.java
rename to src/main/java/org/junit/runner/notification/RunListener.java
diff --git a/src/org/junit/runner/notification/RunNotifier.java b/src/main/java/org/junit/runner/notification/RunNotifier.java
similarity index 100%
rename from src/org/junit/runner/notification/RunNotifier.java
rename to src/main/java/org/junit/runner/notification/RunNotifier.java
diff --git a/src/org/junit/runner/notification/StoppedByUserException.java b/src/main/java/org/junit/runner/notification/StoppedByUserException.java
similarity index 100%
rename from src/org/junit/runner/notification/StoppedByUserException.java
rename to src/main/java/org/junit/runner/notification/StoppedByUserException.java
diff --git a/src/org/junit/runner/notification/package-info.java b/src/main/java/org/junit/runner/notification/package-info.java
similarity index 100%
rename from src/org/junit/runner/notification/package-info.java
rename to src/main/java/org/junit/runner/notification/package-info.java
diff --git a/src/org/junit/runner/package-info.java b/src/main/java/org/junit/runner/package-info.java
similarity index 100%
rename from src/org/junit/runner/package-info.java
rename to src/main/java/org/junit/runner/package-info.java
diff --git a/src/org/junit/runners/AllTests.java b/src/main/java/org/junit/runners/AllTests.java
similarity index 100%
rename from src/org/junit/runners/AllTests.java
rename to src/main/java/org/junit/runners/AllTests.java
diff --git a/src/org/junit/runners/BlockJUnit4ClassRunner.java b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
similarity index 100%
rename from src/org/junit/runners/BlockJUnit4ClassRunner.java
rename to src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
diff --git a/src/org/junit/runners/JUnit4.java b/src/main/java/org/junit/runners/JUnit4.java
similarity index 100%
rename from src/org/junit/runners/JUnit4.java
rename to src/main/java/org/junit/runners/JUnit4.java
diff --git a/src/org/junit/runners/Parameterized.java b/src/main/java/org/junit/runners/Parameterized.java
similarity index 100%
rename from src/org/junit/runners/Parameterized.java
rename to src/main/java/org/junit/runners/Parameterized.java
diff --git a/src/org/junit/runners/ParentRunner.java b/src/main/java/org/junit/runners/ParentRunner.java
similarity index 100%
rename from src/org/junit/runners/ParentRunner.java
rename to src/main/java/org/junit/runners/ParentRunner.java
diff --git a/src/org/junit/runners/Suite.java b/src/main/java/org/junit/runners/Suite.java
similarity index 100%
rename from src/org/junit/runners/Suite.java
rename to src/main/java/org/junit/runners/Suite.java
diff --git a/src/org/junit/runners/model/FrameworkField.java b/src/main/java/org/junit/runners/model/FrameworkField.java
similarity index 100%
rename from src/org/junit/runners/model/FrameworkField.java
rename to src/main/java/org/junit/runners/model/FrameworkField.java
diff --git a/src/org/junit/runners/model/FrameworkMember.java b/src/main/java/org/junit/runners/model/FrameworkMember.java
similarity index 100%
rename from src/org/junit/runners/model/FrameworkMember.java
rename to src/main/java/org/junit/runners/model/FrameworkMember.java
diff --git a/src/org/junit/runners/model/FrameworkMethod.java b/src/main/java/org/junit/runners/model/FrameworkMethod.java
similarity index 100%
rename from src/org/junit/runners/model/FrameworkMethod.java
rename to src/main/java/org/junit/runners/model/FrameworkMethod.java
diff --git a/src/org/junit/runners/model/InitializationError.java b/src/main/java/org/junit/runners/model/InitializationError.java
similarity index 100%
rename from src/org/junit/runners/model/InitializationError.java
rename to src/main/java/org/junit/runners/model/InitializationError.java
diff --git a/src/org/junit/runners/model/MultipleFailureException.java b/src/main/java/org/junit/runners/model/MultipleFailureException.java
similarity index 100%
rename from src/org/junit/runners/model/MultipleFailureException.java
rename to src/main/java/org/junit/runners/model/MultipleFailureException.java
diff --git a/src/org/junit/runners/model/NoGenericTypeParametersValidator.java b/src/main/java/org/junit/runners/model/NoGenericTypeParametersValidator.java
similarity index 100%
rename from src/org/junit/runners/model/NoGenericTypeParametersValidator.java
rename to src/main/java/org/junit/runners/model/NoGenericTypeParametersValidator.java
diff --git a/src/org/junit/runners/model/RunnerBuilder.java b/src/main/java/org/junit/runners/model/RunnerBuilder.java
similarity index 100%
rename from src/org/junit/runners/model/RunnerBuilder.java
rename to src/main/java/org/junit/runners/model/RunnerBuilder.java
diff --git a/src/org/junit/runners/model/RunnerScheduler.java b/src/main/java/org/junit/runners/model/RunnerScheduler.java
similarity index 100%
rename from src/org/junit/runners/model/RunnerScheduler.java
rename to src/main/java/org/junit/runners/model/RunnerScheduler.java
diff --git a/src/org/junit/runners/model/Statement.java b/src/main/java/org/junit/runners/model/Statement.java
similarity index 100%
rename from src/org/junit/runners/model/Statement.java
rename to src/main/java/org/junit/runners/model/Statement.java
diff --git a/src/org/junit/runners/model/TestClass.java b/src/main/java/org/junit/runners/model/TestClass.java
similarity index 100%
rename from src/org/junit/runners/model/TestClass.java
rename to src/main/java/org/junit/runners/model/TestClass.java
diff --git a/src/org/junit/runners/package-info.java b/src/main/java/org/junit/runners/package-info.java
similarity index 100%
rename from src/org/junit/runners/package-info.java
rename to src/main/java/org/junit/runners/package-info.java