XPLANBOX-2591 - created xplan-cli-tools, moved xplan-manager-cli

xplan-cli/pom.xml

@@ -12,12 +12,12 @@
   </parent>
 
   <modules>
-    <module>xplan-manager-cli</module>
     <module>xplan-validator-cli</module>
     <module>xplan-transform-cli</module>
     <module>xplan-evaluation-schema-synchronize-cli</module>
     <module>xplan-validatedb-cli</module>
     <module>xplan-update-data-cli</module>
+    <module>xplan-cli-tools</module>
   </modules>
 
   <profiles>

xplan-cli/xplan-manager-cli/pom.xml → xplan-cli/xplan-cli-tools/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-manager-cli</artifactId>
+  <artifactId>xplan-cli-tools</artifactId>
   <packaging>jar</packaging>
-  <description>Kommandozeilentool des XPlan Managers</description>
+  <description>Kommandozeilenwerkzeuge fuer die xPlanBox</description>
 
   <parent>
     <groupId>de.latlon.product.xplanbox</groupId>
@@ -12,7 +14,7 @@
   </parent>
 
   <properties>
-    <mainclass>de.latlon.xplan.manager.cli.XPlanManagerCLI</mainclass>
+    <mainclass>de.latlon.xplanbox.cli.manager.XPlanManagerCLI</mainclass>
     <application-name>XPlanManager</application-name>
   </properties>
 
@@ -61,7 +63,7 @@
             <id>bundle</id>
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
-              <filters />
+              <filters/>
               <descriptors>
                 <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
               </descriptors>
@@ -84,7 +86,7 @@
               <target>
                 <chmod perm="+x">
                   <fileset dir="target/appassembler/bin">
-                    <include name="${application-name}" />
+                    <include name="${application-name}"/>
                   </fileset>
                 </chmod>
               </target>
@@ -174,4 +176,4 @@
       <artifactId>snakeyaml</artifactId>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/ServiceMetadataRecordCreator.java → xplan-cli/xplan-cli-tools/src/main/java/de/latlon/xplanbox/cli/manager/ServiceMetadataRecordCreator.java

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package de.latlon.xplan.manager.cli;
+package de.latlon.xplanbox.cli.manager;
 
 import de.latlon.xplan.commons.XPlanType;
 import de.latlon.xplan.commons.feature.XPlanFeatureCollection;

xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/XPlanManagerApplicationRunner.java → xplan-cli/xplan-cli-tools/src/main/java/de/latlon/xplanbox/cli/manager/XPlanManagerApplicationRunner.java

@@ -18,10 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package de.latlon.xplan.manager.cli;
+package de.latlon.xplanbox.cli.manager;
 
 import de.latlon.xplan.manager.XPlanManager;
-import de.latlon.xplan.manager.cli.config.ApplicationContext;
+import de.latlon.xplanbox.cli.manager.config.ApplicationContext;
 import de.latlon.xplan.manager.log.SystemLog;
 import de.latlon.xplan.manager.web.shared.RasterEvaluationResult;
 import de.latlon.xplan.manager.web.shared.XPlan;
@@ -43,7 +43,7 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Optional;
 
-import static de.latlon.xplan.manager.cli.XPlanManagerCLI.printUsage;
+import static de.latlon.xplanbox.cli.manager.XPlanManagerCLI.printUsage;
 
 /**
  * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>

xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/XPlanManagerCLI.java → xplan-cli/xplan-cli-tools/src/main/java/de/latlon/xplanbox/cli/manager/XPlanManagerCLI.java

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package de.latlon.xplan.manager.cli;
+package de.latlon.xplanbox.cli.manager;
 
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;

xplan-cli/xplan-manager-cli/src/main/java/de/latlon/xplan/manager/cli/config/ApplicationContext.java → xplan-cli/xplan-cli-tools/src/main/java/de/latlon/xplanbox/cli/manager/config/ApplicationContext.java

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package de.latlon.xplan.manager.cli.config;
+package de.latlon.xplanbox.cli.manager.config;
 
 import de.latlon.xplan.commons.archive.XPlanArchiveCreator;
 import de.latlon.xplan.commons.configuration.ConfigurationDirectoryPropertiesLoader;
@@ -32,8 +32,8 @@ import de.latlon.xplan.core.manager.db.repository.PlanRepository;
 import de.latlon.xplan.core.manager.db.repository.PlanwerkWmsMetadataRepository;
 import de.latlon.xplan.manager.CategoryMapper;
 import de.latlon.xplan.manager.XPlanManager;
-import de.latlon.xplan.manager.cli.ServiceMetadataRecordCreator;
-import de.latlon.xplan.manager.cli.XPlanManagerCLI;
+import de.latlon.xplanbox.cli.manager.ServiceMetadataRecordCreator;
+import de.latlon.xplanbox.cli.manager.XPlanManagerCLI;
 import de.latlon.xplan.manager.configuration.ManagerConfiguration;
 import de.latlon.xplan.manager.database.ManagerWorkspaceWrapper;
 import de.latlon.xplan.manager.database.XPlanDbAdapter;