From 98fe66f058b589d8130f27412ce62bc2be60c87c Mon Sep 17 00:00:00 2001
From: mgramin <mgramin@gmail.com>
Date: Thu, 30 May 2019 11:44:00 +0400
Subject: [PATCH] #326 move malewicz to resource files

---
 .gitignore                     |  2 +-
 pom.xml                        | 28 +---------------------------
 src/main/assembly/assembly.xml | 19 ++++++++++---------
 src/main/malewicz/src/main.js  |  2 +-
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index cab150f2..f0dfe56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,5 @@ target/
 src/main/assembly/static/lib/*.jar
 
 src/main/generated-sources
-src/resources/public
+src/main/resources/public/*
 conf/sql-boot*
diff --git a/pom.xml b/pom.xml
index e397fbb1..921bb9b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,6 +399,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -441,7 +442,6 @@
                     <installDirectory>target</installDirectory>
                 </configuration>
                 <executions>
-                    <!-- Install our node and npm version to run npm/node scripts-->
                     <execution>
                         <id>install node and npm</id>
                         <goals>
@@ -451,20 +451,16 @@
                             <nodeVersion>v11.14.0</nodeVersion>
                         </configuration>
                     </execution>
-                    <!-- Install all project dependencies -->
                     <execution>
                         <id>npm install</id>
                         <goals>
                             <goal>npm</goal>
                         </goals>
-                        <!-- optional: default phase is "generate-resources" -->
                         <phase>generate-resources</phase>
-                        <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
                             <arguments>install</arguments>
                         </configuration>
                     </execution>
-                    <!-- Build and minify static files -->
                     <execution>
                         <id>npm run build</id>
                         <goals>
@@ -477,28 +473,6 @@
                 </executions>
             </plugin>
 
-
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <copy todir="src/main/resources/public">
-                                    <fileset dir="src/main/malewicz/dist"/>
-                                </copy>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 
diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
index 6de0386b..33086d81 100644
--- a/src/main/assembly/assembly.xml
+++ b/src/main/assembly/assembly.xml
@@ -26,19 +26,10 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
     <id>bin</id>
-    <!--<baseDirectory>/</baseDirectory>-->
     <formats>
-        <!--<format>tar.gz</format>-->
-        <!--<format>tar.bz2</format>-->
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>conf</directory>
-            <outputDirectory>conf</outputDirectory>
-        </fileSet>
-    </fileSets>
     <files>
         <file>
             <source>target/sql-boot-0.3.0-SNAPSHOT.jar</source>
@@ -53,4 +44,14 @@
             <source>src/main/resources/application.yml</source>
         </file>
     </files>
+    <fileSets>
+        <fileSet>
+            <directory>conf</directory>
+            <outputDirectory>conf</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/malewicz/dist</directory>
+            <outputDirectory>public</outputDirectory>
+        </fileSet>
+    </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/src/main/malewicz/src/main.js b/src/main/malewicz/src/main.js
index 7e7e68f2..36712a65 100644
--- a/src/main/malewicz/src/main.js
+++ b/src/main/malewicz/src/main.js
@@ -31,7 +31,7 @@ Vue.config.productionTip = false
 
 const store = new Vuex.Store({
   state: {
-    host: 'http://localhost:8007/',
+    host: 'http://81.23.10.106:8007/',
     connections: '',
     type: 'table',
     path: [''],