db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb build.xml
Date Sun, 02 Mar 2003 22:34:30 GMT
thma        2003/03/02 14:34:30

  Modified:    .        build.xml
  Log:
  fix jar detection for jdk 1.2 and jdk 1.3
  
  Revision  Changes    Path
  1.75      +27 -5     db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- build.xml	28 Feb 2003 21:30:13 -0000	1.74
  +++ build.xml	2 Mar 2003 22:34:30 -0000	1.75
  @@ -10,7 +10,7 @@
       <!-- Allow any user specific values to override the defaults -->
       <property file="${user.home}/build.properties" />
       <property file="build.properties"/>
  -    
  +
       <!-- load the profile set in build.properties -->
       <property file="profile/${profile}.profile"/>
   
  @@ -65,10 +65,9 @@
               <available classname="com.sun.jdori.FieldManager" classpathref="compilation-classpath"/>
             </and>
           </condition>
  -
       </target>
   
  -    <target name="use-jdk12" if="jdk-12" depends="detect-jdk">
  +    <target name="use-jdk12" if="jdk-12" depends="detect-jdk, check-jdk12proxy-classes,
check-jndi-classes">
       	<property name="JDK" value="-JDK13"/>
       	<property name="JDBC" value="-JDBC30"/>
       	<property name="excludes" value="org/apache/ojb/tools/mapping/**"/>
  @@ -99,6 +98,16 @@
       	<condition property="jdk-14">
           	<equals arg1="${ant.java.version}" arg2="1.4" />
     		</condition>
  +        <condition property="jndi.classes">
  +          <and>
  +            <available classname="javax.naming.InitialContext" classpathref="compilation-classpath"/>
  +          </and>
  +        </condition>
  +        <condition property="jdk12proxy.classes">
  +          <and>
  +            <available classname="com.develop.java.lang.reflect.Proxy" classpathref="compilation-classpath"/>
  +          </and>
  +        </condition>
       </target>
   
       <target name="set-archive-name-date" if="useDate">
  @@ -180,6 +189,13 @@
       <target name="check-jdori-classes" unless="jdori.classes">
          <fail>jdori.jar is missing! Please get it from http://java.sun.com/products/jdo.
Put it in lib or have the ant property jdo.jars point at this jar file.</fail>
       </target>
  +    <target name="check-jndi-classes" if="jdk-12" unless="jndi.classes">
  +       <fail>jndi.jar is missing! Please get it from http://java.sun.com/. Put it
in the lib directory.</fail>
  +    </target>
  +    <target name="check-jdk12proxy-classes" if="jdk-12" unless="jdk12proxy.classes">
  +       <fail>proxy.jar is missing! Please get it from http://sf.net/projects/objectbridge/.
Put it in the lib directory.</fail>
  +    </target>
  +
   
   
   
  @@ -244,12 +260,12 @@
   	</target>
   
   	<target name="useP6Spy" if="shouldUseP6Spy">
  -		<echo message="using P6Spy to trace JDBC calls. Value of useP6Spy is ${useP6Spy}"/>
  +		<echo message="using P6Spy to trace JDBC calls."/>
   		<property name="jdbcRuntimeDriver" value="com.p6spy.engine.spy.P6SpyDriver"/>
   	</target>
   
   	<target name="dontUseP6Spy" unless="shouldUseP6Spy">
  -		<echo message="NOT using P6Spy to trace JDBC calls. Value of useP6Spy is ${useP6Spy}"/>
  +		<echo message="NOT using P6Spy to trace JDBC calls."/>
   		<property name="jdbcRuntimeDriver" value="${databaseDriver}"/>
   	</target>
   
  @@ -539,6 +555,9 @@
                 <exclude name="ejb.jar"/>
                 <exclude name="servlet.jar"/>
                 <exclude name="jta-spec1_0_1.jar"/>
  +	      <exclude name="j2ee.jar"/>
  +	      <exclude name="jndi.jar"/>
  +	      <exclude name="proxy.jar"/>
               </fileset>
           </copy>
   
  @@ -622,6 +641,9 @@
                 <exclude name="ejb.jar"/>
                 <exclude name="servlet.jar"/>
                 <exclude name="jta-spec1_0_1.jar"/>
  +	      <exclude name="j2ee.jar"/>
  +	      <exclude name="jndi.jar"/>
  +	      <exclude name="proxy.jar"/>
               </fileset>
           </copy>
   
  
  
  

Mime
View raw message