Refactor cli-app package to be ...geogig.cli.app

Signed-off-by: Gabriel Roldan <[email protected]>

Author: Gabriel Roldan

src/cli-app/pom.xml

@@ -118,15 +118,15 @@
           </platforms>
           <programs>
             <program>
-              <mainClass>org.locationtech.geogig.cli.CLI</mainClass>
+              <mainClass>org.locationtech.geogig.cli.app.CLI</mainClass>
               <name>geogig</name>
             </program>
             <!--program>
               <mainClass>org.locationtech.geogig.cli.GeogigConsole</mainClass>
               <name>geogig-console</name>
             </program-->
             <program>
-              <mainClass>org.locationtech.geogig.cli.GeogigPy4JEntryPoint</mainClass>
+              <mainClass>org.locationtech.geogig.cli.app.GeogigPy4JEntryPoint</mainClass>
               <name>geogig-gateway</name>
             </program>
           </programs>
@@ -146,7 +146,7 @@
                 <finalName>geogig</finalName>
                 <archive>
                     <manifest>
-                        <mainClass>org.locationtech.geogig.cli.CLI</mainClass>
+                        <mainClass>org.locationtech.geogig.cli.app.CLI</mainClass>
                     </manifest>
                 </archive>
                 <descriptors>
@@ -161,7 +161,7 @@
                         <finalName>geogig</finalName>
                         <archive>
                             <manifest>
-                                <mainClass>org.locationtech.geogig.cli.CLI</mainClass>
+                                <mainClass>org.locationtech.geogig.cli.app.CLI</mainClass>
                             </manifest>
                         </archive>
                         <descriptors>

src/cli-app/src/main/java/org/locationtech/geogig/cli/CLI.java renamed to src/cli-app/src/main/java/org/locationtech/geogig/cli/app/CLI.java

@@ -7,8 +7,11 @@
  * Contributors:
  * Gabriel Roldan (Boundless) - extract main() method from GeoGigCLI
  */
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
+import org.locationtech.geogig.cli.CLIContextBuilder;
+import org.locationtech.geogig.cli.Console;
+import org.locationtech.geogig.cli.GeogigCLI;
 import org.locationtech.geogig.porcelain.ConfigOp;
 import org.locationtech.geogig.porcelain.ConfigOp.ConfigAction;
 import org.locationtech.geogig.porcelain.ConfigOp.ConfigScope;

src/cli-app/src/main/java/org/locationtech/geogig/cli/GeoGigPy4JProgressListener.java renamed to src/cli-app/src/main/java/org/locationtech/geogig/cli/app/GeoGigPy4JProgressListener.java

@@ -7,7 +7,7 @@
  * Contributors:
  * Victor Olaya (Boundless) - initial implementation
  */
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
 /**
  * An interface for progress listener for the Py4j entry point.

src/cli-app/src/main/java/org/locationtech/geogig/cli/GeogigPy4JEntryPoint.java renamed to src/cli-app/src/main/java/org/locationtech/geogig/cli/app/GeogigPy4JEntryPoint.java

@@ -7,7 +7,7 @@
  * Contributors:
  * Victor Olaya (Boundless) - initial implementation
  */
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -17,6 +17,8 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.locationtech.geogig.cli.Console;
+import org.locationtech.geogig.cli.GeogigCLI;
 import org.locationtech.geogig.model.impl.DefaultPlatform;
 import org.locationtech.geogig.repository.DefaultProgressListener;
 import org.locationtech.geogig.repository.ProgressListener;

src/cli-app/src/main/java/org/locationtech/geogig/cli/Logging.java renamed to src/cli-app/src/main/java/org/locationtech/geogig/cli/app/Logging.java

@@ -7,7 +7,7 @@
  * Contributors:
  * Gabriel Roldan (Boundless) - initial implementation
  */
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -125,7 +125,7 @@ private static URL getOrCreateLoggingConfigFile(final File geogigdir) {
             }
         }
         ByteSource from;
-        final URL resource = GeogigCLI.class.getResource("logback_default.xml");
+        final URL resource = CLI.class.getResource("logback_default.xml");
         try {
             from = Resources.asByteSource(resource);
         } catch (NullPointerException npe) {

src/cli-app/src/main/resources/org/locationtech/geogig/cli/logback_default.xml renamed to src/cli-app/src/main/resources/org/locationtech/geogig/cli/app/logback_default.xml

@@ -1,10 +1,11 @@
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.locationtech.geogig.cli.Console;
 
 public class ConsoleTest {
 

src/cli-app/src/test/java/org/locationtech/geogig/cli/ConsoleTest.java renamed to src/cli-app/src/test/java/org/locationtech/geogig/cli/app/ConsoleTest.java

@@ -7,7 +7,7 @@
  * Contributors:
  * Victor Olaya (Boundless) - initial implementation
  */
-package org.locationtech.geogig.cli;
+package org.locationtech.geogig.cli.app;
 
 import static org.junit.Assert.assertTrue;
 import static org.locationtech.geogig.cli.test.functional.TestFeatures.points1;

src/cli-app/src/test/java/org/locationtech/geogig/cli/GeogigPy4JEntryPointTest.java renamed to src/cli-app/src/test/java/org/locationtech/geogig/cli/app/GeogigPy4JEntryPointTest.java

@@ -92,7 +92,7 @@ public boolean isAnsiSupported() {
         return forceAnsi || (ansiEnabled && ansiSupported);
     }
 
-    protected boolean checkAnsiSupported(OutputStream out, String osName) throws Throwable {
+    public boolean checkAnsiSupported(OutputStream out, String osName) throws Throwable {
         if (out != System.out) {
             return false;
         }