Update codebase for Docker container

mgreau · mgreau · commit 6917496da910 · 2016-02-01T19:26:29.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,8 @@
 		<version.jboss.spec.javaee.7.0>8.0.0.Beta1</version.jboss.spec.javaee.7.0>
 		<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
 
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
 		<!-- Maven -->
 		<maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
 		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
@@ -41,7 +43,7 @@
 	</dependencyManagement>
 
 	<build>
-		<finalName>usopen</finalName>
+		<finalName>${finalName}</finalName>
 		<pluginManagement>
 			<plugins>
 				<plugin>
diff --git a/src/main/java/com/mgreau/wildfly/websocket/StarterService.java b/src/main/java/com/mgreau/wildfly/websocket/StarterService.java
@@ -26,7 +26,7 @@ public class StarterService {
     public void init() {
         logger.log(Level.INFO, "Initializing App.");
         random = new Random();
-        matches.put("1234", new TennisMatch("1234", "US OPEN - QUARTER FINALS", "Ferrer D.", "es", "Almagro N.", "es"));
+        matches.put("1234", new TennisMatch("1234", "ROLLAND GARROS - QUARTER FINALS", "Ferrer D.", "es", "Almagro N.", "es"));
         matches.put("1235", new TennisMatch("1235", "US OPEN - QUARTER FINALS", "Djokovic N.", "rs", "Berdych T.", "cz"));
         matches.put("1236", new TennisMatch("1236", "US OPEN - QUARTER FINALS", "Murray A.", "gb", "Chardy J.", "fr"));
         matches.put("1237", new TennisMatch("1237", "US OPEN - QUARTER FINALS", "Federer R.", "ch", "Tsonga J.W.", "fr"));
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Java EE 7 - Websocket - Wildfly 8 - OpenShit</title>
+<title>Java EE 7 - Websocket - Wildfly 8.2 - OpenShit</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="description" content="" />
diff --git a/src/main/webapp/js/live/services.js b/src/main/webapp/js/live/services.js
@@ -10,7 +10,7 @@ app.factory('WebSocketService', function($window) {
 			return;
 		}
 		
-		var appPath = $window.location.pathname.split('/')[1];
+		var appPath = "/";//$window.location.pathname.split('/')[1];
 		var host = $window.location.hostname;
 		var port = "8080";
 		var protocol = "ws";
diff --git a/src/main/webapp/live.html b/src/main/webapp/live.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="tennisApp">
 <head>
-<title>Java EE 7 - Websocket - AngularJS - Wildfly 8 - OpenShit</title>
+<title>Java EE 7 - Websocket - AngularJS - Wildfly 8.2 - OpenShit</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="description" content="" />
@@ -27,7 +27,7 @@
 </head>
 <body  ng-app="tennisApp" ng-controller="TournamentCtrl">
 	<div class="container">
-		<h2>Tennis Game Tournament - Java EE 7 - Java API for Websocket - AngularJS</h2>
+		<h2>Tennis Game Tournament - Java EE 7 - Java API for WebSocket - AngularJS</h2>
 		<p class="lead">AngularJS HTML5 app sample to illustrate the new Java API
 			for WebSocket (JSR 356).</p>
 		<p>

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ app.factory('WebSocketService', function($window) {`
`10`	`10`	`return;`
`11`	`11`	`}`
`12`	`12`
`13`		`- var appPath = $window.location.pathname.split('/')[1];`
	`13`	`+ var appPath = "/";//$window.location.pathname.split('/')[1];`
`14`	`14`	`var host = $window.location.hostname;`
`15`	`15`	`var port = "8080";`
`16`	`16`	`var protocol = "ws";`