Fehlerkorrektur im CLI-Servlet

Peter Hormanns

2011-05-19 eb4ed908ac855a593d13e609e93ac16b46dc8ad8

 hsarback/build.xml

@@ -5,6 +5,7 @@
   <property name="lib.home" value="${basedir}/lib" />
   <property name="conf.home" value="${basedir}/conf" />
   <property name="src.home" value="${basedir}/src" />
   <property name="test.home" value="${basedir}/test" />
   <property name="dist.home" value="${basedir}/dist" />

   <property file="${user.home}/.hsar.ant.properties" />
@@ -33,12 +34,28 @@
      <delete dir="${dist.home}" />
   </target>

   <target name="deploy" depends="war">
      <delete dir="${hsar.deploy.dir}/hsar" />
      <copy file="build/hsar.war" todir="${hsar.deploy.dir}" />
      <sleep minutes="5"/>
   </target>

   <target name="war" depends="enhance">
      <copy file="conf/WEB-INF/web.xml" todir="webapp/WEB-INF/">
         <filterset>
            <filter token="LOGIN_HOST" value="${cas.domain.name}"/>
            <filter token="LOGIN_PORT" value="${cas.https.port}"/>
            <filter token="CONFIG_HOST" value="${hsar.domain.name}"/>
            <filter token="CONFIG_PORT" value="${hsar.https.port}"/>
         </filterset>
      </copy>
        <war destfile="build/hsar.war" basedir="webapp">
           <lib dir="lib">
              <include name="**/*.jar"/>
             <exclude name="**/servlet*.jar"/>
             <exclude name="**/geronimo-jms*.jar"/>
             <exclude name="**/geronimo-j2ee-management*.jar"/>
             <exclude name="**/activemq*.jar"/>
           </lib>
           <classes dir="build/cls" />
           <classes dir="src">
@@ -54,8 +71,21 @@
   <target name="compile" description="compilieren">
      <mkdir dir="${build.home}" />
      <mkdir dir="${build.home}/cls" />
      <javac srcdir="${src.home}" destdir="${build.home}/cls" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
      <javac srcdir="${src.home}" destdir="${build.home}/cls" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" encoding="UTF8" includeantruntime="false">
         <classpath refid="compile.classpath" />
      </javac>
   </target>

   <target name="compile-test" description="tests compilieren" depends="compile">
      <mkdir dir="${build.home}" />
      <mkdir dir="${build.home}/test" />
      <javac srcdir="${test.home}" destdir="${build.home}/test" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" encoding="UTF8" includeantruntime="false">
         <classpath refid="compile.classpath" />
         <classpath>
            <pathelement path="${compile.classpath}"/>
            <pathelement location="${build.home}/cls"/>
            <pathelement path="/usr/share/java/junit4.jar"/>
         </classpath>
      </javac>
   </target>

@@ -74,13 +104,13 @@

   <target name="init-db" description="init empty database">
      <sql
         classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
         classpath="/usr/share/java/postgresql-jdbc3.jar"
         driver="org.postgresql.Driver" 
         url="jdbc:postgresql://localhost:5432/${database.name}"
         userid="${database.user}" password="${database.password}" 
         src="database/schema.sql" />      
      <sql
         classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
         classpath="/usr/share/java/postgresql-jdbc3.jar"
         driver="org.postgresql.Driver" 
         url="jdbc:postgresql://localhost:5432/${database.name}"
         userid="${database.user}" password="${database.password}" 
@@ -89,11 +119,29 @@
   
   <target name="drop-db" description="make empty database">
      <sql
         classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
         classpath="/usr/share/java/postgresql-jdbc3.jar"
         driver="org.postgresql.Driver" 
         url="jdbc:postgresql://localhost:5432/${database.name}"
         userid="${database.user}" password="${database.password}" 
         src="database/dropschema.sql" />      
   </target>
   
   <target name="remote-test" description="inspection of xmlrpc-api" depends="compile-test">
      <mkdir dir="${build.home}/junit" />
      <junit printsummary="yes" fork="yes">
         <jvmarg value="-Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore}"/>
         <jvmarg value="-Djavax.net.ssl.trustStorePassword=${javax.net.ssl.trustStorePassword}"/>
         <classpath>
            <fileset dir="lib">
               <include name="*.jar" />
            </fileset>
            <pathelement location="${build.home}/cls"/>
            <pathelement location="${build.home}/test"/>
            <pathelement path="/usr/share/java/junit4.jar"/>
         </classpath>
         <formatter type="xml"/>
         <test name="de.hsadmin.remote.RemoteTest" todir="${build.home}/junit" />
      </junit>
   </target>
	
</project>