Merge remote-tracking branch 'origin/master'

.gitignore

@@ -1,32 +1,6 @@
-# PWM Project gitignore files
-#
-# Maven Output
-/target
-
-# Eclipse Project Files
-/.project
-/.settings
-/.classpath
-
-# IntelliJ Project Files
-.idea/
-/*.iml
-
-# OS folder info
-.directory
-.DS_Store
-.DS_Store?
-
-
-# Older PWM versions defaulted the applicationPath dir to WEB-INF.  This section ignores them if the applicationPath is set to WEB-INF.
-/src/main/webapp/WEB-INF/logs
-/src/main/webapp/WEB-INF/PwmConfiguration.xml
-/src/main/webapp/WEB-INF/backup
-/src/main/webapp/WEB-INF/LocalDB
-/bin/
-/src/main/webapp/WEB-INF/applicationPath.lock
-/src/main/webapp/public/resources/themes/mdefault
-/src/main/webapp/public/resources/themes/netiq32
-/src/main/webapp/public/resources/themes/idm
-/src/main/webapp/public/resources/themes/netiq
-/src/main/webapp/public/resources/app
+/.idea
+/pwm.iml
+/client/target
+/client/pwm-client.iml
+/client/.node
+/client/.idea

src/main/angular/package.json → client/package.json

@@ -36,6 +36,7 @@
     "fontgen-loader": "0.2.1",
     "html-loader": "0.4.4",
     "html-webpack-plugin": "2.22.0",
+    "ignore-loader": "0.1.2",
     "jasmine": "2.5.2",
     "jshint": "2.9.3",
     "jshint-loader": "0.8.3",

client/pom.xml

@@ -0,0 +1,109 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.pwm-project</groupId>
+        <artifactId>pwm-parent</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <prerequisites>
+        <maven>3.2</maven>
+    </prerequisites>
+
+    <artifactId>pwm-client</artifactId>
+    <packaging>jar</packaging>
+
+    <name>PWM Password Self Service: Client</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>copy-client-files</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>dist</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>remove-client-files</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>.node</directory>
+                                </fileset>
+                                <fileset>
+                                    <directory>dist</directory>
+                                </fileset>
+                                <fileset>
+                                    <directory>node_modules</directory>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <nodeVersion>v6.6.0</nodeVersion>
+                    <npmVersion>3.10.8</npmVersion>
+                    <installDirectory>.node</installDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install-node-and-npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>npm-install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-run-build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>