Refactor package names

src/main/java/org/sonar/runner/BootstrapClassLoader.java

@@ -56,7 +56,7 @@ class BootstrapClassLoader extends URLClassLoader {
    * @return true, if class can be loaded from parent ClassLoader
    */
   boolean canLoadFromParent(String name) {
-    if (name.startsWith("org.sonar.runner.") && !name.startsWith("org.sonar.runner.batch.")) {
+    if (name.startsWith("org.sonar.runner.") && !name.startsWith("org.sonar.runner.internal.batch.")) {
       return true;
     }
     for (String pkg : unmaskedPackages) {

src/main/java/org/sonar/runner/Runner.java

@@ -255,7 +255,7 @@ public final class Runner {
     ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
     try {
       Thread.currentThread().setContextClassLoader(sonarClassLoader);
-      Class<?> launcherClass = sonarClassLoader.findClass("org.sonar.runner.batch.Launcher");
+      Class<?> launcherClass = sonarClassLoader.findClass("org.sonar.runner.internal.batch.Launcher");
       Constructor<?> constructor = launcherClass.getConstructor(Properties.class, List.class);
       Object launcher = constructor.newInstance(getProperties(), containerExtensions);
       Method method = launcherClass.getMethod("execute");

src/main/java/org/sonar/runner/batch/Launcher.java → src/main/java/org/sonar/runner/internal/batch/Launcher.java

@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;

src/main/java/org/sonar/runner/batch/SonarProjectBuilder.java → src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
 
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;

src/main/java/org/sonar/runner/batch/SonarRunnerUtils.java → src/main/java/org/sonar/runner/internal/batch/SonarRunnerUtils.java

@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import org.apache.commons.lang.StringUtils;
 

src/main/java/org/sonar/runner/batch/package-info.java → src/main/java/org/sonar/runner/internal/batch/package-info.java

@@ -21,4 +21,4 @@
  * Internal package that creates the project definition and launches the analyses based on it.
  * Should not be used by consumers.
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;

src/test/java/org/sonar/runner/BootstrapClassLoaderTest.java

@@ -33,7 +33,7 @@ public class BootstrapClassLoaderTest {
   @Test
   public void should_restrict_loading_from_parent() throws Exception {
     BootstrapClassLoader classLoader = new BootstrapClassLoader(getClass().getClassLoader(), "org.apache.ant");
-    assertThat(classLoader.canLoadFromParent("org.sonar.runner.batch.Launcher")).isFalse();
+    assertThat(classLoader.canLoadFromParent("org.sonar.runner.internal.batch.Launcher")).isFalse();
     assertThat(classLoader.canLoadFromParent("org.sonar.runner.Runner")).isTrue();
     assertThat(classLoader.canLoadFromParent("org.objectweb.asm.ClassVisitor")).isFalse();
     assertThat(classLoader.canLoadFromParent("org.apache.ant.project.Project")).isTrue();

src/test/java/org/sonar/runner/batch/LauncherTest.java → src/test/java/org/sonar/runner/internal/batch/LauncherTest.java

@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.configuration.BaseConfiguration;

src/test/java/org/sonar/runner/batch/SonarProjectBuilderTest.java → src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java

@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import org.junit.Rule;
 import org.junit.Test;

src/test/java/org/sonar/runner/batch/SonarRunnerUtilsTest.java → src/test/java/org/sonar/runner/internal/batch/SonarRunnerUtilsTest.java

@@ -17,7 +17,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
-package org.sonar.runner.batch;
+package org.sonar.runner.internal.batch;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;