User: rinkrank
  Date: 02/03/24 09:44:16

  Modified:    core/samples/script Build.bat build.xml
  Log:
  Merging changes from XJAVADOC_REFACTORING branch back to main branch
  
  Revision  Changes    Path
  1.6       +2 -0      xdoclet/core/samples/script/Build.bat
  
  Index: Build.bat
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/samples/script/Build.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- Build.bat 7 Feb 2002 21:57:42 -0000       1.5
  +++ Build.bat 24 Mar 2002 17:44:15 -0000      1.6
  @@ -10,6 +10,8 @@
   set _CP_=..\lib\ant.jar
   set _CP_=%_CP_%;..\lib\crimson.jar
   set _CP_=%_CP_%;..\lib\jaxp.jar
  +set _CP_=%_CP_%;..\lib\log4j.jar
  +set _CP_=%_CP_%;..\lib\ant.jar
   
   "%JAVA_HOME%\bin\java.exe" -classpath 
"%JAVA_HOME%\lib\tools.jar;%_CP_%;%CLASSPATH%" -Dlog4j.configuration=log4j.properties 
org.apache.tools.ant.Main %1 %2 %3 %4 %5
   
  
  
  
  1.63      +9 -8      xdoclet/core/samples/script/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/samples/script/build.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -w -r1.62 -r1.63
  --- build.xml 14 Mar 2002 20:42:55 -0000      1.62
  +++ build.xml 24 Mar 2002 17:44:16 -0000      1.63
  @@ -23,6 +23,7 @@
   
         <property name="lib.dir" value="lib" />
         <property name="xdoclet.jar.path" value="${basedir}/lib/xdoclet.jar" />
  +      <property name="xjavadoc.jar.path" value="${basedir}/lib/xjavadoc.jar" />
         <property name="log4j.jar.path" value="lib/log4j.jar" />
         <property name="log4j.path" value="${basedir}/script" />
         <property name="ant.jar.path" value="lib/ant.jar" />
  @@ -98,7 +99,7 @@
      <target name="ejbdoclet" depends="prepare">
   
         <taskdef name="ejbdoclet"
  -               classname="xdoclet.ejb.EjbDocletTask" 
classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path}"
  +               classname="xdoclet.ejb.EjbDocletTask" 
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path}"
         />
   
         <ejbdoclet
  @@ -156,7 +157,7 @@
               version="6.1"
               xmlencoding="UTF-8"
               destdir="${ejb.dd.dir}"
  -            validatexml="true"
  +            validatexml="false"
               datasource="xdoclet.samples"
               mergedir="${src.dir}"
            />
  @@ -164,7 +165,7 @@
               version="4.0"
               xmlencoding="UTF-8"
               destdir="${ejb.dd.dir}"
  -            validatexml="true"
  +            validatexml="false"
            />
   
            <!--
  @@ -195,7 +196,7 @@
      <target name="webdoclet" depends="prepare">
   
         <taskdef name="webdoclet"
  -               classname="xdoclet.web.WebDocletTask" 
classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path}"
  +               classname="xdoclet.web.WebDocletTask" 
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path}"
         />
   
         <webdoclet
  @@ -236,7 +237,7 @@
      <target name="jmxdoclet" depends="prepare">
   
         <taskdef name="jmxdoclet"
  -               classname="xdoclet.jmx.JMXDocletTask" 
classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path}"
  +               classname="xdoclet.jmx.JMXDocletTask" 
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path}"
         />
   
         <jmxdoclet
  @@ -379,13 +380,13 @@
         <taskdef
            name="document"
            classname="xdoclet.doc.DocumentDocletTask"
  -         classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path}"
  +         
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path}"
         />
   
         <document
            sourcepath="${src.dir}"
            destdir="${build.dir}/todo"
  -         
classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path};${java.class.path}"
  +         
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path};${java.class.path}"
         >
            <fileset dir="${src.dir}">
               <include name="**/*.java" />
  @@ -418,7 +419,7 @@
         <taskdef
            name="replacecopy"
            classname="xdoclet.ant.ReplaceCopy"
  -         classpath="${xdoclet.jar.path};${log4j.jar.path};${ant.jar.path}"
  +         
classpath="${xdoclet.jar.path};${xjavadoc.jar.path};${log4j.jar.path};${ant.jar.path}"
         />
         <replacecopy
            file="config/application/application.xml"
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to