Move client code to src/main/client

Author: Dave Syer

.gitignore

@@ -1,44 +1,24 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+target/
+!.mvn/wrapper/maven-wrapper.jar
 
-# compiled output
-/target
-/dist
-/tmp
-/out-tsc
-
-# dependencies
-/node
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
+### STS ###
+.apt_generated
 .classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-testem.log
-/typings
+.factorypath
+.project
+.settings
+.springBeans
 
-# e2e
-/e2e/*.js
-/e2e/*.map
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 
-# System Files
-.DS_Store
-Thumbs.db
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/

README.md

@@ -59,21 +59,26 @@ node: 8.8.1
 os: linux x64
 ```
 
-No create an angular app:
+Now create an angular app:
 
 ```
 $ ./ng new client
 $ rm -rf client/node*
-$ mv client/src tmp
-$ mv client/* client/.??* .
-$ rm -rf client
-$ mv tmp client
-$ sed -i -e 's,src,client,' .angular-cli.json
-$ sed -i -e 's,dist,target/classes/static,' .angular-cli.json
+$ mv client src/main
+$ sed -i -e 's,dist,../../../target/classes/static,' src/main/client/.angular-cli.json
+$ mv ng npm src/main/client
 ```
 
 Add
 
+```
+                <configuration>
+                    <workingDirectory>src/main/client</workingDirectory>
+                </configuration>
+```
+
+and
+
 ```
                     <execution>
                         <id>npm-install</id>
@@ -89,7 +94,7 @@ Add
 Install the modules again using `mvn generate-resources`.
 
 ```
-$ ./ng version
+$ (cd src/main/client; ./ng version)
     _                      _                 ____ _     ___
    / \   _ __   __ _ _   _| | __ _ _ __     / ___| |   |_ _|
   / △ \ | '_ \ / _` | | | | |/ _` | '__|   | |   | |    | |
@@ -117,7 +122,7 @@ typescript: 2.3.4
 And the tests work:
 
 ```
-$ ./ng e2e.
+$ (cd src/main/client; ./ng e2e.)
 ..
 [13:59:46] I/direct - Using ChromeDriver directly...
 Jasmine started

pom.xml

@@ -48,6 +48,7 @@
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.6</version>
                 <configuration>
+                    <workingDirectory>src/main/client</workingDirectory>
                     <nodeVersion>v8.8.1</nodeVersion>
                 </configuration>
                 <executions>

.angular-cli.json src/main/client/.angular-cli.json.angular-cli.json renamed to src/main/client/.angular-cli.json

@@ -5,8 +5,8 @@
   },
   "apps": [
     {
-      "root": "client",
-      "outDir": "target/classes/static",
+      "root": "src",
+      "outDir": "../../../target/classes/static",
       "assets": [
         "assets",
         "favicon.ico"
@@ -36,11 +36,11 @@
   },
   "lint": [
     {
-      "project": "client/tsconfig.app.json",
+      "project": "src/tsconfig.app.json",
       "exclude": "**/node_modules/**"
     },
     {
-      "project": "client/tsconfig.spec.json",
+      "project": "src/tsconfig.spec.json",
       "exclude": "**/node_modules/**"
     },
     {

.editorconfig src/main/client/.editorconfig.editorconfig renamed to src/main/client/.editorconfig

@@ -0,0 +1,44 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/target
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db