From ca4c350791f527b78c853c76bddc78018447d6cf Mon Sep 17 00:00:00 2001
From: Joerg Hohwiller <hohwille@users.sourceforge.net>
Date: Mon, 15 Jun 2015 17:20:15 +0200
Subject: [PATCH] #214: integrate oasp4js with oasp4j

---
 .gitmodules                                   |   3 +
 oasp4j-samples/oasp4j-sample-server/pom.xml   | 109 ++++++++++++------
 .../oasp4j-sample-server/src/main/client      |   1 +
 3 files changed, 77 insertions(+), 36 deletions(-)
 create mode 160000 oasp4j-samples/oasp4j-sample-server/src/main/client

diff --git a/.gitmodules b/.gitmodules
index 0d74bef6a..9d6d1f5ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "oasp4j-ide"]
 	path = oasp4j-ide
 	url = https://github.com/oasp/oasp4j-ide.git
+[submodule "oasp4j-samples/oasp4j-sample-server/src/main/client"]
+	path = oasp4j-samples/oasp4j-sample-server/src/main/client
+	url = https://github.com/oasp/oasp4js.git
diff --git a/oasp4j-samples/oasp4j-sample-server/pom.xml b/oasp4j-samples/oasp4j-sample-server/pom.xml
index 5f965dc1f..30bd7ecb3 100644
--- a/oasp4j-samples/oasp4j-sample-server/pom.xml
+++ b/oasp4j-samples/oasp4j-sample-server/pom.xml
@@ -12,6 +12,9 @@
   <packaging>war</packaging>
   <name>${project.artifactId}</name>
   <description>Server for the restaurant application - a simple example using the Open Application Standard Platform for Java (OASP4J).</description>
+  <properties>
+    <client.src.dir>src/main/client</client.src.dir>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -21,43 +24,77 @@
     </dependency>
   </dependencies>
 
-  <!-- Overlays for JavaScript client -->
-  <profiles>
-    <profile>
-      <id>jsclient</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.oasp.js</groupId>
-          <artifactId>oasp4js-sample</artifactId>
-          <version>1.0.0-SNAPSHOT</version>
-          <type>zip</type>
-          <classifier>web</classifier>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${client.src.dir}/dist</directory>
+              <targetPath>jsclient</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${client.src.dir}/dist</directory>
+            </fileset>
+            <fileset>
+              <directory>${client.src.dir}/.tmp</directory>
+            </fileset>
+            <fileset>
+              <directory>${client.src.dir}/app/bower_components</directory>
+            </fileset>
+            <!--
+            <fileset>
+              <directory>${client.src.dir}/node_modules</directory>
+            </fileset>
+            -->
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.3.1</version>
+        <executions>
+          <execution>
+            <id>npm</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
-              <overlays>
-                <overlay>
-                  <groupId>io.oasp.js</groupId>
-                  <artifactId>oasp4js-sample</artifactId>
-                  <type>zip</type>
-                  <classifier>web</classifier>
-                  <targetPath>jsclient</targetPath>
-                </overlay>
-              </overlays>
+              <executable>npm</executable>
+              <arguments>
+                <argument>install</argument>
+              </arguments>
+              <workingDirectory>${client.src.dir}</workingDirectory>
             </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+          </execution>
+          <execution>
+            <id>gulp</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>gulp</executable>
+              <arguments>
+                <argument>build:dist</argument>
+              </arguments>
+              <workingDirectory>${client.src.dir}</workingDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/oasp4j-samples/oasp4j-sample-server/src/main/client b/oasp4j-samples/oasp4j-sample-server/src/main/client
new file mode 160000
index 000000000..2392bd6a8
--- /dev/null
+++ b/oasp4j-samples/oasp4j-sample-server/src/main/client
@@ -0,0 +1 @@
+Subproject commit 2392bd6a84e197af3c227b6685a02896eeef17ff