Moved jmeter load tests into their own directory.

.cvsignore

@@ -1,3 +1,3 @@
 local-config
 .DS_Store
-
+build.properties

build.properties

@@ -1,8 +1,11 @@
 #Configure properties to access the Manager application user/pass combo should be in $TOMCAT_HOME/conf/tomcat-users.xml with manager role.
+catalina.home=/usr/local/tomcat8080
+catalina.base=/usr/local/tomcat2020
 url=http://localhost:2020/manager
-username=
-password=
+username=travis
+password=bavis
 
 #These properties need to be set to run the unit tests. They are your login to the dictionary
-lex.username=
-lex.password=
+lex.username=travis
+lex.password=bavis
+jmeter.home=/Users/travis/webapps/jmeter

build.xml

@@ -114,17 +114,12 @@
 	<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">
-
-    <src path="${source}/java"/>
-    <include name="org/thdl/lex/**"/>
-    <exclude name="**/old/**"/>
-  </javac> 	
+		<src path="${source}/java"/>
+		<include name="org/thdl/lex/**"/>
+		<exclude name="**/old/**"/>
+	  </javac> 	
   </target>
 	
-	<target name="test" description="Testing" depends="compile">
-		<java classname="org.thdl.lex.${class}" classpath="${build}/WEB-INF/classes/" classpathref="classpath"/>
-	</target>
-	
 	<target name="javadoc" description="Create Javadocs">		
 		<javadoc destdir="${build}/apidocs/" classpathref="classpath" author="true" version="true" use="true" windowtitle="THDL Tibetan Collaborative Dictionary API">
 			
@@ -169,6 +164,24 @@
 		<remove url="${url}" username="${username}" password="${password}" path="${path}"/>
 	</target>
 	
+	<target name="test" description="Run unit tests">
+		<java classname="org.thdl.lex.test.MainMenuTestCase" classpathref="classpath" fork="yes">
+			<classpath>
+				<pathelement location="${build}/WEB-INF/classes"/>
+			</classpath>
+			<arg value="${ lex.username }"/>
+			<arg value="${ lex.password }"/>
+		</java>
+	</target>
+	
+	<target name="reload-test" description="Remove and Re-install web application" depends="reload">
+		<antcall target="test"/>
+	</target>
+	
+	<target name="install-test" description="Remove and Re-install web application" depends="install">
+		<antcall target="test"/>
+	</target>
+	
 	<target name="hbm2java" description="generate source code">
 		<tstamp prefix="now"/>
 		<echo message="time is: ${now.DSTAMP}_${now.TSTAMP}"/>

src/jsp/login.jsp

@@ -14,11 +14,11 @@ Please login to use the THDL Tibetan Collaborative Dictionaries
 </c:if>
 
 
-<form action='/lex/login' method="post">
+<form id='loginForm' action='/lex/login' method="post">
 <p>
-Username: <c:out value="<input type='text' id='username' size='16' value='${ usernameValue }'>" escapeXml="false" />
+Username: <c:out value="<input type='text' name='username' size='16' value='${ usernameValue }'>" escapeXml="false" />
 <br />
-Password: <input type='password' id='password' size='20' value=''>
+Password: <input type='password' name='password' size='20' value=''>
 <br />
 <input type='submit' value='Log in'>
 </p>