[FIX] Non root url

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/config/AppStartup.java

@@ -39,6 +39,9 @@ public class AppStartup implements ApplicationListener<ApplicationEvent> {
     @Value("${server.port}")
     private String SERVER_PORT;
 
+    @Value("${server.servlet.context-path}")
+    private String CONTEXT_PATH;
+
     @Value("${nodejs.binary:node}")
     String nodeJsBinaryName;
 
@@ -124,7 +127,7 @@ private void printWelcomeMessage() {
         System.out.println("          version:     " + AppVersion.BUILD_VERSION);
         System.out.println("          build id:    " + AppVersion.BUILD_ID);
         System.out.println("          build date:  " + AppVersion.BUILD_DATE);
-        System.out.println("          Access the Cakeshop UI at: http://localhost:" + SERVER_PORT);
+        System.out.println("          Access the Cakeshop UI at: http://localhost:" + SERVER_PORT + CONTEXT_PATH);
     }
 
     public String getDebugInfo(ServletContext servletContext) {

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/config/WebSocketConfig.java

@@ -43,7 +43,7 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
             .addEndpoint("ws")
             .setAllowedOrigins("*")
             .withSockJS()
-            .setClientLibraryUrl("/cakeshop/js/vendor/sockjs-1.0.3.min.js");
+            .setClientLibraryUrl("/cakeshop/js/vendor/sockjs-1.5.0.min.js");
     }
 
 }

cakeshop-api/src/main/resources/config/application.properties

@@ -32,6 +32,8 @@ spring.data.rest.basePath=/api
 
 server.port=8080
 
+server.servlet.context-path=/
+
 logging.level.root=WARN
 logging.level.io.swagger=DEBUG
 logging.level.org.springframework=INFO

cakeshop-api/src/main/webapp/js/components/Manage.js

@@ -127,7 +127,9 @@ export default class Manage extends Component {
         }).then(response => {
             if (response.status === 200) {
                 console.log("Success:", response.status, response.statusText);
-                window.location = "/";
+                var loc = window.location.pathname;
+                var dir = loc.substring(0, loc.lastIndexOf('/'));
+                window.location = dir + "/";
             } else {
                 console.log("Error:", response.status, response.statusText);
             }

cakeshop-api/src/main/webapp/js/components/NodeChooser.js

@@ -69,7 +69,7 @@ export default class NodeChooser extends Component {
 
     onChange = (option, action, other) => {
         if (option.value === "manage") {
-            window.location = "/manage.html";
+            window.location = "manage.html";
             return;
         }
 

cakeshop-api/src/main/webapp/js/widgets/peers-neighborhood.js

@@ -64,7 +64,7 @@ module.exports = function() {
 
 			_.each(hood, function(ip) {
 				var port = (window.location.port ? ':' + window.location.port : ''),
-					ep = window.location.protocol + '//' + ip + port + '/ws',
+					ep = window.location.protocol + '//' + ip + port + window.location.pathname + 'ws',
 					stomp = Stomp.over(new SockJS(ep));
 
 				stomp.debug = null;

cakeshop-api/src/main/webapp/sandbox.html

@@ -260,7 +260,7 @@ <h3>Compiler Output</h3>
   <script src="js/vendor/bluebird.core.min.js" charset="utf-8"></script>
 
   <!-- blockchain sdk + deps -->
-  <script src="js/vendor/sockjs-1.0.3.min.js" charset="utf-8"></script>
+  <script src="js/vendor/sockjs-1.5.0.min.js" charset="utf-8"></script>
   <script src="js/vendor/stomp.min.js" charset="utf-8"></script>
   <script src="js/vendor/cakeshop.js" charset="utf-8"></script>
 

cakeshop-api/src/main/webapp/test.html

@@ -11,7 +11,11 @@
 //        var stompTransClient = null;
 
         function connect() {
-            var socket = new SockJS('/ws');
+            var loc = window.location.href;
+            var dir = loc.substring(0, loc.lastIndexOf('/'));
+
+            var wsUrl = dir + '/ws';
+            var socket = new SockJS(wsUrl);
             stompClient = Stomp.over(socket);
             stompClient.connect({}, function(frame) {
                 console.log('Connected NODE: ' + frame);

cakeshop-api/src/main/webapp/test_trans.html

@@ -9,7 +9,11 @@
         var stompClient = null;
 
         function initilizeSocket() {
-            var socket = new SockJS('/ws');
+            var loc = window.location.href;
+            var dir = loc.substring(0, loc.lastIndexOf('/'));
+
+            var wsUrl = dir + '/ws';
+            var socket = new SockJS(wsUrl);
             stompClient = Stomp.over(socket);
             stompClient.connect({}, function (frame){});
         }

cakeshop-api/src/test/resources/config/application.properties

@@ -31,6 +31,8 @@ spring.data.rest.basePath=/api
 
 server.port=8080
 
+server.servlet.context-path=/
+
 logging.level.root=WARN
 logging.level.io.swagger=DEBUG
 logging.level.org.springframework=INFO

cakeshop-client-js/src/main/javascript/lib/client.js

@@ -53,8 +53,10 @@
 
     Client.connected = false;
     Client.connect = function() {
+        var loc = window.location.href;
+        var dir = loc.substring(0, loc.lastIndexOf('/'));
 
-        var wsUrl = '/ws';
+        var wsUrl = dir + '/ws';
 
         var stomp = Client.stomp = Stomp.over(new SockJS(wsUrl));
 

docs/configuration.md

@@ -38,7 +38,7 @@ The format of the JSON file is as follows:
 ]
 ```
 
-The rpcUrl field should be the RPC endpoint on the GoQuorum (geth) node, and the transactionManagerUrl should be the Tessera 3rd Party API endpoint. 
+The rpcUrl field should be the RPC endpoint on the GoQuorum (geth) node, and the transactionManagerUrl should be the Tessera 3rd Party API endpoint.
 
 Provide the location of the initial nodes file through application.properties or by using the `-D` flag mentioned above.
 ```sh
@@ -79,10 +79,13 @@ cakeshop.reporting.ui=http://localhost:3000
 # port to run on
 server.port=8080
 
+# context
+server.servlet.context-path=/
+
 #logging levels
 logging.level.root=WARN
 logging.level.org.springframework=INFO
 logging.level.com.jpmorgan.cakeshop=INFO
 ```
 
-See the [default config file](../cakeshop-api/src/main/resources/config/application.properties) for more. 
+See the [default config file](../cakeshop-api/src/main/resources/config/application.properties) for more.