From 2356dcc6cf9f158b082f066ccb896a97abdbf367 Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 9 Jan 2013 18:33:42 +0000
Subject: [PATCH] Remove JSP from HTML to use with async support.

---
 .../src/main/webapp/deckBuild.html            | 40 ++++++++++++++----
 .../gemp-lotr-web/src/main/webapp/game.html   | 41 +++++++++++++++----
 .../gemp-lotr-web/src/main/webapp/hall.html   | 40 ++++++++++++++----
 .../src/main/webapp/includes/changeLog.html   |  9 ++--
 .../src/main/webapp/includes/contribute.html  |  6 ---
 .../src/main/webapp/includes/formatRules.html |  6 ---
 .../src/main/webapp/includes/gameHistory.html |  6 ---
 .../src/main/webapp/includes/instruction.html |  6 ---
 .../main/webapp/includes/leagueResults.html   |  6 ---
 .../src/main/webapp/includes/leagueRules.html |  6 ---
 .../webapp/includes/registrationForm.html     |  6 ---
 .../src/main/webapp/includes/stats.html       |  6 ---
 .../webapp/includes/tournamentResults.html    |  6 ---
 .../src/main/webapp/includes/yourStats.html   |  6 ---
 .../gemp-lotr-web/src/main/webapp/index.html  | 40 ++++++++++++++----
 .../src/main/webapp/leagueAdmin.html          | 40 ++++++++++++++----
 .../src/main/webapp/merchant.html             | 40 ++++++++++++++----
 17 files changed, 202 insertions(+), 108 deletions(-)
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
index 7c71af804..9e0a0df22 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +6,39 @@ response.setDateHeader ("Expires", -1);
 
     <link rel="stylesheet" type="text/css" href="css/gemp-001/deckBuild.css">
 
-    <%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
index 0e9c8074f..e031c2383 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +6,40 @@ response.setDateHeader ("Expires", -1);
 
     <link rel="stylesheet" type="text/css" href="css/gemp-001/game.css">
 
-<%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
+
 
 <script type="text/javascript">
     var ui;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
index b23c38acc..9ee1d5526 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +6,39 @@ response.setDateHeader ("Expires", -1);
 
     <link rel="stylesheet" type="text/css" href="css/gemp-001/hall.css">
 
-<%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
 
 <script type="text/javascript">
     var chat;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 8a96d4df9..cab7f27b5 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,10 +1,7 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <pre style="font-size:80%">
+<b>09 Jan. 2013</b>
+- "Gnawing, Biting, Hacking, Burning" should now correctly stack discarded orc.
+
 <b>05 Jan. 2013</b>
 - If you have "No Business of Ours" in play, you can still reveal or look at FP player's hand.
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/contribute.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/contribute.html
index c106ca939..21e201f40 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/contribute.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/contribute.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <h1>How can I help?</h1>
 <p>You can contribute in multiple ways:</p>
 <ul>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html
index 1ac74a36e..3a2dcd636 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/formatRules.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <b>Fellowship block</b>
 <ul>
     <li>cards from sets 01-03 are legal,</li>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
index 296e3e644..3498d433b 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/gameHistory.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/instruction.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/instruction.html
index 6e1c85eb0..4d1e5967c 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/instruction.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/instruction.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <h1>Manual</h1>
 
 <p><i>Courtesy of Drachu84 (with further changes by MarcinS)</i></p>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
index c7e93507a..ac413178c 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueResults.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueRules.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueRules.html
index e7fca5460..16220d206 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueRules.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/leagueRules.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <h1>League rules</h1>
 <p>Points marked with (SEALED) refer to sealed leagues only.</p>
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/registrationForm.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/registrationForm.html
index 8e651bbe5..c82f16a14 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/registrationForm.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/registrationForm.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 Login: <input id='login' type='text'><br/>
 Password: <input id='password' type='password'><br/>
 Password repeated: <input id='password2' type='password'><br/>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/stats.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/stats.html
index cf4123b80..cba5d8296 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/stats.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/stats.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/tournamentResults.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/tournamentResults.html
index 2dbe4437c..8cabefceb 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/tournamentResults.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/tournamentResults.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/yourStats.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/yourStats.html
index 0cb20239b..dc374719f 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/yourStats.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/yourStats.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <script type="text/javascript">
     $(document).ready(
             function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
index d41f4d3e6..60b5bd19e 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -21,7 +15,39 @@ response.setDateHeader ("Expires", -1);
         }
     </style>
 
-    <%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
 
     <script type="text/javascript">
         jQuery.fn.center = function () {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
index 15c98b47b..0e2f96382 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <html>
 <head>
     <title>Gemp-LotR League Administration</title>
@@ -26,7 +20,39 @@ response.setDateHeader ("Expires", -1);
         }
     </style>
 
-    <%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
 
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index f28e9f98b..b1a0f0f59 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -1,9 +1,3 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%
-response.setHeader("Cache-Control","no-cache");
-response.setHeader("Pragma","no-cache");
-response.setDateHeader ("Expires", -1);
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +6,39 @@ response.setDateHeader ("Expires", -1);
 
     <link rel="stylesheet" type="text/css" href="css/gemp-001/merchant.css">
 
-    <%@ include file="js.inc" %>
+    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-015/common.js"></script>
+    <script type="text/javascript" src="js/gemp-015/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-015/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-015/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-015/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/cardFilter.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-015/jCards.js"></script>
+
+    <script type="text/javascript" src="js/gemp-015/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-015/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-015/merchantUi.js"></script>
 
     <script type="text/javascript">
 
