Update deps and use proper connection pooling with the db

.classpath

@@ -17,12 +17,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.project

@@ -20,11 +20,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-                <buildCommand>
-                        <name>org.eclipse.wst.validation.validationbuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.hibernate.eclipse.console.hibernateBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -38,5 +43,6 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.hibernate.eclipse.console.hibernateNature</nature>
 	</natures>
 </projectDescription>

.settings/oracle.eclipse.tools.webtier.ui.prefs

@@ -0,0 +1,5 @@
+_hiddenCategory_\:HTML=false
+_hiddenCategory_\:ManagedBeans=false
+_hiddenCategory_\:PageVariables=false
+_hiddenCategory_\:jsp11=false
+eclipse.preferences.version=1

.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,16 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

.settings/org.eclipse.wst.common.component

@@ -3,7 +3,9 @@
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
         <property name="java-output-path" value="/cah/build/classes"/>
-        <property name="context-root" value="zy"/>
+        <property name="context-root" value="ROOT"/>
     </wb-module>
 </project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v7.0"/>
+  <runtime name="Apache Tomcat v8.0"/>
   <fixed facet="jst.web"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="java"/>
-  <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.1"/>
 </faceted-project>

.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

.settings/org.hibernate.eclipse.console.prefs

@@ -1,4 +1,3 @@
-#Thu Jan 12 14:12:39 PST 2012
-default.configuration=
+default.configuration=pyx
 eclipse.preferences.version=1
-hibernate3.enabled=false
+hibernate3.enabled=true

.tern-project

@@ -0,0 +1 @@
+{"libs":["ecma5","browser"],"plugins":{"guess-types":{},"outline":{}},"ide":{}}

WebContent/js/cah.constants.js

@@ -62,7 +62,7 @@ cah.$.GameInfo.STATE = "S";
 cah.$.GameInfo.ID = "gid";
 cah.$.GameInfo.HAS_PASSWORD = "hp";
 
-cah.$.GameState = function() {
+cah.$.AjaxRequest = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.GameState.prototype.dummyForAutocomplete = undefined;
@@ -78,7 +78,7 @@ cah.$.GameState_msg['j'] = "In Progress";
 cah.$.GameState_msg['l'] = "Not Started";
 cah.$.GameState_msg['ro'] = "In Progress";
 
-cah.$.CardSetData = function() {
+cah.$.AjaxResponse = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.CardSetData.prototype.dummyForAutocomplete = undefined;
@@ -109,7 +109,7 @@ cah.$.WhiteCardData.TEXT = "T";
 cah.$.WhiteCardData.ID = "cid";
 cah.$.WhiteCardData.WATERMARK = "W";
 
-cah.$.LongPollResponse = function() {
+cah.$.CardSetData = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.LongPollResponse.prototype.dummyForAutocomplete = undefined;
@@ -137,7 +137,7 @@ cah.$.LongPollResponse.ERROR = "e";
 cah.$.LongPollResponse.INTERMISSION = "i";
 cah.$.LongPollResponse.REASON = "qr";
 
-cah.$.LongPollEvent = function() {
+cah.$.DisconnectReason = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.LongPollEvent.prototype.dummyForAutocomplete = undefined;
@@ -259,7 +259,7 @@ cah.$.ErrorInformation.WHITE_CARDS_REQUIRED = "wcr";
 cah.$.ErrorInformation.BLACK_CARDS_REQUIRED = "bcr";
 cah.$.ErrorInformation.BLACK_CARDS_PRESENT = "bcp";
 
-cah.$.AjaxResponse = function() {
+cah.$.GameInfo = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.AjaxResponse.prototype.dummyForAutocomplete = undefined;
@@ -282,7 +282,7 @@ cah.$.AjaxResponse.CARD_ID = "cid";
 cah.$.AjaxResponse.ERROR = "e";
 cah.$.AjaxResponse.CARD_SETS = "css";
 
-cah.$.AjaxRequest = function() {
+cah.$.GameOptionData = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.AjaxRequest.prototype.dummyForAutocomplete = undefined;
@@ -298,7 +298,7 @@ cah.$.AjaxRequest.CARD_ID = "cid";
 cah.$.AjaxRequest.CARDCAST_ID = "cci";
 cah.$.AjaxRequest.GAME_ID = "gid";
 
-cah.$.AjaxOperation = function() {
+cah.$.GamePlayerInfo = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.AjaxOperation.prototype.dummyForAutocomplete = undefined;
@@ -335,7 +335,7 @@ cah.$.ReconnectNextAction.prototype.dummyForAutocomplete = undefined;
 cah.$.ReconnectNextAction.GAME = "game";
 cah.$.ReconnectNextAction.NONE = "none";
 
-cah.$.DisconnectReason = function() {
+cah.$.WhiteCardData = function() {
   // Dummy constructor to make Eclipse auto-complete.
 };
 cah.$.DisconnectReason.prototype.dummyForAutocomplete = undefined;
@@ -344,4 +344,3 @@ cah.$.DisconnectReason.BANNED = "B&";
 cah.$.DisconnectReason.IDLE_TIMEOUT = "it";
 cah.$.DisconnectReason.KICKED = "k";
 cah.$.DisconnectReason.MANUAL = "man";
-