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 @@
war
${project.artifactId}
Server for the restaurant application - a simple example using the Open Application Standard Platform for Java (OASP4J).
+
+ src/main/client
+
@@ -21,43 +24,77 @@
-
-
-
- jsclient
-
- false
-
-
-
- io.oasp.js
- oasp4js-sample
- 1.0.0-SNAPSHOT
- zip
- web
- runtime
-
-
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+
+
+
+ ${client.src.dir}/dist
+ jsclient
+
+
+
+
+
+ maven-clean-plugin
+
+
+
+ ${client.src.dir}/dist
+
+
+ ${client.src.dir}/.tmp
+
+
+ ${client.src.dir}/app/bower_components
+
+
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.3.1
+
+
+ npm
+ generate-sources
+
+ exec
+
-
-
- io.oasp.js
- oasp4js-sample
- zip
- web
- jsclient
-
-
+ npm
+
+ install
+
+ ${client.src.dir}
-
-
-
-
-
+
+
+ gulp
+ generate-sources
+
+ exec
+
+
+ gulp
+
+ build:dist
+
+ ${client.src.dir}
+
+
+
+
+
+
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