ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject cvs commit: jakarta-ant/lib xml-apis.jar xmlParserAPIs.jar
Date Tue, 28 May 2002 00:33:36 GMT
ehatcher    02/05/27 17:33:36

  Modified:    .        Tag: ANT_15_BRANCH bootstrap.bat bootstrap.sh
                        build.bat build.sh build.xml
  Added:       lib      Tag: ANT_15_BRANCH xml-apis.jar
  Removed:     lib/optional Tag: ANT_15_BRANCH xml-apis.jar
               lib      Tag: ANT_15_BRANCH xmlParserAPIs.jar
  Log:
  finally fix the XMLCatalog nightmare?!
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.48.2.2  +1 -1      jakarta-ant/bootstrap.bat
  
  Index: bootstrap.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
  retrieving revision 1.48.2.1
  retrieving revision 1.48.2.2
  diff -u -r1.48.2.1 -r1.48.2.2
  --- bootstrap.bat	10 May 2002 09:29:08 -0000	1.48.2.1
  +++ bootstrap.bat	28 May 2002 00:33:35 -0000	1.48.2.2
  @@ -26,7 +26,7 @@
   if     "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build
   if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build
   
  -SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar
  +SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar
   for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i
   if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar
   if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip
  
  
  
  1.64.2.1  +1 -1      jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.64
  retrieving revision 1.64.2.1
  diff -u -r1.64 -r1.64.2.1
  --- bootstrap.sh	16 Apr 2002 12:12:39 -0000	1.64
  +++ bootstrap.sh	28 May 2002 00:33:35 -0000	1.64.2.1
  @@ -79,7 +79,7 @@
     rm -r build
   fi
   
  -CLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar:${CLASSPATH}
  +CLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:${CLASSPATH}
   
   DIRLIBS=lib/optional/*.jar
   for i in ${DIRLIBS}
  
  
  
  1.34.2.1  +1 -1      jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.34
  retrieving revision 1.34.2.1
  diff -u -r1.34 -r1.34.2.1
  --- build.bat	16 Apr 2002 12:18:23 -0000	1.34
  +++ build.bat	28 May 2002 00:33:35 -0000	1.34.2.1
  @@ -13,7 +13,7 @@
   goto cleanup
   
   :runAnt
  -set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar;bootstrap\lib\ant.jar
  +set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar;bootstrap\lib\ant.jar
   for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
   set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
   set LOCALCLASSPATH=
  
  
  
  1.27.2.2  +1 -1      jakarta-ant/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.sh,v
  retrieving revision 1.27.2.1
  retrieving revision 1.27.2.2
  diff -u -r1.27.2.1 -r1.27.2.2
  --- build.sh	7 May 2002 14:02:32 -0000	1.27.2.1
  +++ build.sh	28 May 2002 00:33:35 -0000	1.27.2.2
  @@ -21,7 +21,7 @@
     exit
   fi
   
  -LOCALCLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar:bootstrap/lib/ant.jar
  +LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:bootstrap/lib/ant.jar
   # add in the dependency .jar files
   DIRLIBS=lib/optional/*.jar
   for i in ${DIRLIBS}
  
  
  
  1.304.2.11 +10 -3     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.304.2.10
  retrieving revision 1.304.2.11
  diff -u -r1.304.2.10 -r1.304.2.11
  --- build.xml	27 May 2002 09:13:36 -0000	1.304.2.10
  +++ build.xml	28 May 2002 00:33:35 -0000	1.304.2.11
  @@ -335,9 +335,16 @@
                      classpathref="classpath"/>
         </and>
       </condition>
  -    <available property="trax.present"
  -               classname="javax.xml.transform.Transformer"
  -               classpathref="classpath" />
  +    <condition property="trax.present">
  +      <or>
  +        <and>
  +          <isset property="javax.xml.transform.TransformerFactory"/>
  +          <available classname="${javax.xml.transform.TransformerFactory}"
  +                     classpathref="classpath" />
  +        </and>
  +        <available resource="META-INF/services/javax.xml.transform.TransformerFactory"/>
  +      </or>
  +    </condition>
       <available property="xslp.present"
                  classname="com.kvisco.xsl.XSLProcessor"
                  classpathref="classpath" />
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +338 -0    jakarta-ant/lib/Attic/xml-apis.jar
  
  	<<Binary file>>
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message