Pulled configurable properties out of build.xml and into build.properties
This commit is contained in:
parent
496c7eb436
commit
10cd2493ed
3 changed files with 19 additions and 16 deletions
8
build.properties
Normal file
8
build.properties
Normal file
|
@ -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=
|
23
build.xml
23
build.xml
|
@ -13,17 +13,9 @@
|
||||||
<!-- Configure the context path for this application -->
|
<!-- Configure the context path for this application -->
|
||||||
<property name="path" value="/lex"/>
|
<property name="path" value="/lex"/>
|
||||||
|
|
||||||
<!-- Configure the path to $CATALINA_HOME for this application
|
<property file="${user.home}/.${ant.project.name}-build.properties"/>
|
||||||
This is used in the classpath to bring in servlet.jar and the jdbc-driver
|
<property file="${user.home}/.build.properties"/>
|
||||||
-->
|
<property file="build.properties"/>
|
||||||
<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"/>
|
|
||||||
|
|
||||||
<!-- Configure the custom Ant tasks for the Manager application
|
<!-- Configure the custom Ant tasks for the Manager application
|
||||||
These tasks require catalina-ant.jar in $ANT_HOME/lib-->
|
These tasks require catalina-ant.jar in $ANT_HOME/lib-->
|
||||||
|
@ -101,7 +93,7 @@
|
||||||
<include name="*.tld"/>
|
<include name="*.tld"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<copy todir="${build}/WEB-INF/lib">
|
<copy todir="${build}/WEB-INF/lib">
|
||||||
<fileset dir="${basedir}/lib/jstl">
|
<fileset dir="${basedir}/lib/jstl">
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
|
@ -111,11 +103,14 @@
|
||||||
</fileset>
|
</fileset>
|
||||||
<fileset dir="${basedir}/lib/thdl">
|
<fileset dir="${basedir}/lib/thdl">
|
||||||
<include name="*.jar"/>
|
<include name="*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
<fileset dir="${basedir}/lib/jwebunit">
|
||||||
|
<include name="*.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile" description="Compile web application" depends="copy">
|
<target name="compile" description="Compile web application" depends="copy">
|
||||||
<mkdir dir="${build}/WEB-INF/classes"/>
|
<mkdir dir="${build}/WEB-INF/classes"/>
|
||||||
<javac destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
|
<javac destdir="${build}/WEB-INF/classes" classpathref="classpath" debug="on" listfiles="no">
|
||||||
|
|
|
@ -16,9 +16,9 @@ Please login to use the THDL Tibetan Collaborative Dictionaries
|
||||||
|
|
||||||
<form action='/lex/login' method="post">
|
<form action='/lex/login' method="post">
|
||||||
<p>
|
<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 />
|
<br />
|
||||||
Password: <input type='password' name='password' size='20' value=''>
|
Password: <input type='password' id='password' size='20' value=''>
|
||||||
<br />
|
<br />
|
||||||
<input type='submit' value='Log in'>
|
<input type='submit' value='Log in'>
|
||||||
</p>
|
</p>
|
||||||
|
|
Loading…
Reference in a new issue