diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 1d46e0f9c..544bf7e0e 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -177,16 +177,11 @@
guacamole.js
- lib/jquery/jquery.js
- lib/angular/angular.min.js
- lib/angular-module-shim/angular-module-shim.js
- lib/messageformat/messageformat.js
license.txt
guacamole-common-js/all.js
- lib/**/*.js
app/**/*.js
generated/**/*.js
@@ -214,7 +209,6 @@
src/main/webapp/app/*/templates/*.html
- src/main/webapp/lib/**/*.js
**/*.json
@@ -288,6 +282,115 @@
runtime
+
+
+ org.webjars
+ webjars-servlet-2.x
+ 1.1
+
+
+
+
+ org.webjars.bower
+ blob-polyfill
+ 1.0.20150320
+ runtime
+
+
+ org.webjars.bower
+ filesaver
+ 1.3.3
+ runtime
+
+
+
+
+ org.webjars.bower
+ lodash
+ 2.4.1
+ runtime
+
+
+
+
+ org.webjars.bower
+ jquery
+ 2.1.3
+ runtime
+
+
+
+
+ org.webjars.bower
+ angular
+ 1.3.16
+ runtime
+
+
+ org.webjars.bower
+ angular-cookies
+ 1.3.16
+ runtime
+
+
+ org.webjars.bower
+ angular-route
+ 1.3.16
+ runtime
+
+
+ org.webjars.bower
+ angular-touch
+ 1.3.16
+ runtime
+
+
+
+
+ org.webjars.bower
+ angular-module-shim
+ 0.0.4
+ runtime
+
+
+ org.webjars.bower
+ angular
+
+
+
+
+
+
+ org.webjars.bower
+ angular-translate
+ 2.8.0
+ runtime
+
+
+ org.webjars.bower
+ angular-translate-interpolation-messageformat
+ 2.8.0
+ runtime
+
+
+ org.webjars.bower
+ messageformat
+
+
+
+
+ org.webjars.bower
+ messageformat
+ 1.0.2
+ runtime
+
+
+ org.webjars.bower
+ angular-translate-loader-static-files
+ 2.8.0
+ runtime
+
+
org.eclipse.jetty
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
index efe9766ad..dfea0e772 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
@@ -43,6 +43,7 @@ import org.apache.guacamole.rest.sharingprofile.SharingProfileModule;
import org.apache.guacamole.rest.tunnel.TunnelCollectionResourceFactory;
import org.apache.guacamole.rest.tunnel.TunnelResourceFactory;
import org.apache.guacamole.rest.user.UserModule;
+import org.webjars.servlet.WebjarsServlet;
/**
* A Guice Module to set up the servlet mappings and authentication-specific
@@ -109,6 +110,10 @@ public class RESTServiceModule extends ServletModule {
bind(JacksonJsonProvider.class).in(Scopes.SINGLETON);
serve("/api/*").with(GuiceContainer.class);
+ // Serve Webjar JavaScript dependencies
+ bind(WebjarsServlet.class).in(Scopes.SINGLETON);
+ serve("/webjars/*").with(WebjarsServlet.class);
+
}
}
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index 36436cf27..c8edd6aa3 100644
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -51,7 +51,32 @@
help-text="loginHelpText"
form="expectedCredentials"
values="acceptedCredentials">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+