Commit 53b8297f authored by Jeff Burke's avatar Jeff Burke
Browse files

Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 

Conflicts:
	projects/cadcAccessControl-Server/test/LdapConfig.test.properties
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
parents 3bb1201e 132b99bd

projects/cadcTomcat/Dependencies.txt

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
JAR files required for the OpenCADC cadcTomcat project

======================================================



Name in build.xml          Versioned Name		Project URL

-----------------          --------------       	-----------

tomcat-coyote.jar		   			http://tomcat.apache.org/

tomcat-util.jar						http://tomcat.apache.org/

tomcat-http.jari					http://tomcat.apache.org/

log4j.jar                  log4j-1.2.15         	http://logging.apache.org/

cadcUtil.jar                                    	http://code.google.com/p/opencadc

projects/cadcTomcat/build.xml

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
<!DOCTYPE project>

<project default="build" basedir=".">



<!--*+

************************************************************************

****  C A N A D I A N   A S T R O N O M Y   D A T A   C E N T R E  *****

*

*   System Name:    build.xml

*

*   Purpose:

*   Over-ride default ant behaviour.

*

*   Date        : Nov 5, 2009

*

****  C A N A D I A N   A S T R O N O M Y   D A T A   C E N T R E  *****

************************************************************************

*-->



    <property environment="env"/>

    <property file="local.build.properties" />

    <property file="${env.A}/compilers/setup.ant.java.properties" />

    <import file="${env.A}/compilers/setup.ant.java.targets.xml"/>



    <property name="project" value="cadcTomcat" />



    <property name="cadcUtil" value="${lib}/cadcUtil.jar"/>

    <property name="log4j" value="${ext.lib}/log4j.jar"/>

    <property name="tomcat-coyote" value="${env.CATALINA_HOME}/server/lib/tomcat-coyote.jar"/>

    <property name="tomcat-util" value="${env.CATALINA_HOME}/server/lib/tomcat-util.jar"/>

    <property name="tomcat-http" value="${env.CATALINA_HOME}/server/lib/tomcat-http.jar"/>



    <!-- JAR files to be included in classpath for compilation -->

    <property name="jars" value="${cadcUtil}:${log4j}:${tomcat-coyote}:${tomcat-util}:${tomcat-http}" />



    <target name="build" depends="compile">

        

        <jar jarfile="${build}/lib/${project}.jar"

            basedir="${build}/class"

            update="no">

            <include name="ca/nrc/cadc/**" />

            <zipfileset includes="**/*.class" src="${cadcUtil}"/>

            <exclude name="**Test**" />

        </jar>

        

    </target>



</project>