From 7852a3ec2b545cd27844c30e580cad8556ac6896 Mon Sep 17 00:00:00 2001
From: Philippe Soares <soaresp2@gmail.com>
Date: Sun, 25 Oct 2020 23:05:27 -0400
Subject: [PATCH] Fix for issue #10204.

---
 .../chat.html => resources/public/index.html} | 50 +++++++++----------
 .../public}/js/sockjs-0.3.4.js                |  0
 .../public}/js/stomp.js                       |  0
 .../public}/js/webSocketSendToUserApp.js      |  0
 4 files changed, 25 insertions(+), 25 deletions(-)
 rename spring-websockets/src/main/{webapp/resources/chat.html => resources/public/index.html} (88%)
 rename spring-websockets/src/main/{webapp/resources => resources/public}/js/sockjs-0.3.4.js (100%)
 rename spring-websockets/src/main/{webapp/resources => resources/public}/js/stomp.js (100%)
 rename spring-websockets/src/main/{webapp/resources => resources/public}/js/webSocketSendToUserApp.js (100%)
diff --git a/spring-websockets/src/main/webapp/resources/chat.html b/spring-websockets/src/main/resources/public/index.html
similarity index 88%
rename from spring-websockets/src/main/webapp/resources/chat.html
rename to spring-websockets/src/main/resources/public/index.html
index 17c8494dd8..f52cca34d1 100644
--- a/spring-websockets/src/main/webapp/resources/chat.html
+++ b/spring-websockets/src/main/resources/public/index.html
@@ -1,73 +1,73 @@
 <html>
 	<head>
 	    <title>Chat WebSocket</title>
-	    
+
 	    <script src="./js/sockjs-0.3.4.js"></script>
 	    <script src="./js/stomp.js"></script>
-	    
+
 	    <script type="text/javascript">
-	    
+
 	        var stompClient = null;
-	        
+
 	        function setConnected(connected) {
-	        	
+
 	            document.getElementById('connect').disabled = connected;
 	            document.getElementById('disconnect').disabled = !connected;
 	            document.getElementById('conversationDiv').style.visibility = connected ? 'visible' : 'hidden';
 	            document.getElementById('response').innerHTML = '';
 	        }
-	        
+
 	        function connect() {
-	        	
-	            var socket = new SockJS('/spring-mvc-java/chat');
-	            stompClient = Stomp.over(socket);  
-	            
+
+	            var socket = new SockJS('/chat');
+	            stompClient = Stomp.over(socket);
+
 	            stompClient.connect({}, function(frame) {
-	                
+
 	            	setConnected(true);
 	                console.log('Connected: ' + frame);
 	                stompClient.subscribe('/topic/messages', function(messageOutput) {
-	                	
+
 	                    showMessageOutput(JSON.parse(messageOutput.body));
 	                });
 	            });
 	        }
-	        
+
 	        function disconnect() {
-	        	
+
 	            if(stompClient != null) {
 	                stompClient.disconnect();
 	            }
-	            
+
 	            setConnected(false);
 	            console.log("Disconnected");
 	        }
-	        
+
 	        function sendMessage() {
-	        	
+
 	        	var from = document.getElementById('from').value;
 	            var text = document.getElementById('text').value;
 	            stompClient.send("/app/chat", {}, JSON.stringify({'from':from, 'text':text}));
 	        }
-	        
+
 	        function showMessageOutput(messageOutput) {
-	        	
+
 	            var response = document.getElementById('response');
 	            var p = document.createElement('p');
 	            p.style.wordWrap = 'break-word';
 	            p.appendChild(document.createTextNode(messageOutput.from + ": " + messageOutput.text + " (" + messageOutput.time + ")"));
 	            response.appendChild(p);
 	        }
-	        
+
 	    </script>
-	    
+
 	</head>
-	
+
 	<body onload="disconnect()">
 
 		<div>
-		
-		
+
+
 			<div>
 				<input type="text" id="from" placeholder="Choose a nickname"/>
 			</div>
@@ -85,4 +85,4 @@
 		</div>
 
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js b/spring-websockets/src/main/resources/public/js/sockjs-0.3.4.js
similarity index 100%
rename from spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js
rename to spring-websockets/src/main/resources/public/js/sockjs-0.3.4.js
diff --git a/spring-websockets/src/main/webapp/resources/js/stomp.js b/spring-websockets/src/main/resources/public/js/stomp.js
similarity index 100%
rename from spring-websockets/src/main/webapp/resources/js/stomp.js
rename to spring-websockets/src/main/resources/public/js/stomp.js
diff --git a/spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js b/spring-websockets/src/main/resources/public/js/webSocketSendToUserApp.js
similarity index 100%
rename from spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js
rename to spring-websockets/src/main/resources/public/js/webSocketSendToUserApp.js
