From 10cd2493edaf4dc2fa2f7e4e29c848afaf4a08a9 Mon Sep 17 00:00:00 2001
From: travismccauley <travismccauley>
Date: Tue, 11 Nov 2003 02:35:38 +0000
Subject: [PATCH] Pulled configurable properties out of build.xml and into
 build.properties

---
 build.properties  |  8 ++++++++
 build.xml         | 23 +++++++++--------------
 src/jsp/login.jsp |  4 ++--
 3 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 build.properties

diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..9214a7d
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,8 @@
+#Configure properties to access the Manager application user/pass combo should be in $TOMCAT_HOME/conf/tomcat-users.xml with manager role.
+url=http://localhost:2020/manager
+username=
+password=
+
+#These properties need to be set to run the unit tests. They are your login to the dictionary
+lex.username=
+lex.password=
diff --git a/build.xml b/build.xml
index c67645a..525601f 100644
--- a/build.xml
+++ b/build.xml
@@ -13,17 +13,9 @@
   <!-- Configure the context path for this application -->
 	<property name="path" value="/lex"/>
 
-  <!-- Configure the path to $CATALINA_HOME for this application 
-  			This is used  in the classpath to bring in servlet.jar and the jdbc-driver
-			-->
-	<property name="catalina.home" value="/usr/local/tomcat8080"/>
-	<property name="catalina.base" value="/usr/local/tomcat2020"/>
-
-  <!-- Configure properties to access the Manager application 
-  			user /pass combo should be in $TOMCAT_HOME/conf/tomcat-users.xml with manager role.-->
-	<property name="url" value="http://localhost:2020/manager"/>
-	<property name="username" value="travis"/>
-	<property name="password" value="bavis"/>
+	<property file="${user.home}/.${ant.project.name}-build.properties"/>
+	<property file="${user.home}/.build.properties"/>
+	<property file="build.properties"/> 
 
   <!-- Configure the custom Ant tasks for the Manager application 
   			These tasks require catalina-ant.jar in $ANT_HOME/lib-->
@@ -101,7 +93,7 @@
 				<include name="*.tld"/>
 			</fileset>
 		</copy>
-		
+
 		<copy todir="${build}/WEB-INF/lib">
 			<fileset dir="${basedir}/lib/jstl">
 				<include name="*.jar"/>
@@ -111,11 +103,14 @@
 			</fileset>			
 			<fileset dir="${basedir}/lib/thdl">
 				<include name="*.jar"/>
+			</fileset>	
+			<fileset dir="${basedir}/lib/jwebunit">
+				<include name="*.jar"/>
 			</fileset>
 		</copy>
-	
+
 	</target>
-	
+
 	<target name="compile" description="Compile web application" depends="copy">
 		<mkdir dir="${build}/WEB-INF/classes"/>
 		<javac  destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
diff --git a/src/jsp/login.jsp b/src/jsp/login.jsp
index e475fa8..1f0090f 100644
--- a/src/jsp/login.jsp
+++ b/src/jsp/login.jsp
@@ -16,9 +16,9 @@ Please login to use the THDL Tibetan Collaborative Dictionaries
 
 <form action='/lex/login' method="post">
 <p>
-Username: <c:out value="<input type='text' name='username' size='16' value='${ usernameValue }'>" escapeXml="false" />
+Username: <c:out value="<input type='text' id='username' size='16' value='${ usernameValue }'>" escapeXml="false" />
 <br />
-Password: <input type='password' name='password' size='20' value=''>
+Password: <input type='password' id='password' size='20' value=''>
 <br />
 <input type='submit' value='Log in'>
 </p>