costin 01/07/23 15:40:47
Modified: java build.xml
java/src/org/apache/xml/dtm/ref
IncrementalSAXSource_Filter.java
java/src/org/apache/xml/utils/synthetic JavaUtils.java
Log:
3 small fixes to the build process ( to make it work with jdk1.4 and crimson)
- exclude IncrementalSAXSource_Xerces if xerces is not detected
- comment-out the "main" in IncrementalSAXSource_Filter.java ( it is a
test, but has deps on xerces )
- don't try to load the compiler in syntetic/JavaUtils. This is a mess,
it was debated on tomcat-dev and ant-dev, as you may know some people
decided to remove the internal compiler class ( sun.tools.javac.Main ),
and that brakes jasper, ant and now xalan.
It seems right now the only portable way to run the compiler is via command
line call in a separate process ( jikes can easily make up for the
overhead of creating a new process and doesn't leave garbage ).
Question: is synthetic used ? Seems like a very usefull package, but if
xalan is not using it it might be better to move it to xml-commons or
jakarta-commons or some other place.
Revision Changes Path
1.120 +3 -1 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- build.xml 2001/07/18 16:02:21 1.119
+++ build.xml 2001/07/23 22:40:47 1.120
@@ -50,7 +50,7 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
- $Id: build.xml,v 1.119 2001/07/18 16:02:21 dleslie Exp $
+ $Id: build.xml,v 1.120 2001/07/23 22:40:47 costin Exp $
==================================================================== -->
@@ -232,6 +232,8 @@
<exclude name="**/CoroutineSAXFilterTest.java"
unless="xerces.present" />
<exclude name="**/CoroutineSAXParser_Xerces.java"
+ unless="xerces.present" />
+ <exclude name="**/IncrementalSAXSource_Xerces.java"
unless="xerces.present" />
</javac>
<!-- Compile Xalan main engine (but not xsltc package yet) -->
1.3 +3 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
Index: IncrementalSAXSource_Filter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncrementalSAXSource_Filter.java 2001/07/20 18:48:11 1.2
+++ IncrementalSAXSource_Filter.java 2001/07/23 22:40:47 1.3
@@ -732,7 +732,8 @@
//================================================================
/** Simple unit test. Attempt coroutine parsing of document indicated
* by first argument (as a URI), report progress.
- */
+ */
+ /*
public static void main(String args[])
{
System.out.println("Starting...");
@@ -799,5 +800,5 @@
}
} // end for
}
-
+ */
} // class IncrementalSAXSource_Filter
1.3 +11 -11
xml-xalan/java/src/org/apache/xml/utils/synthetic/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/JavaUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaUtils.java 2001/01/02 03:41:13 1.2
+++ JavaUtils.java 2001/07/23 22:40:47 1.3
@@ -54,7 +54,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: JavaUtils.java,v 1.2 2001/01/02 03:41:13 sboag Exp $
+ * $Id: JavaUtils.java,v 1.3 2001/07/23 22:40:47 costin Exp $
*/
package org.apache.xml.utils.synthetic;
@@ -163,16 +163,16 @@
fileName
};
- try
- {
- return new sun.tools.javac.Main(System.err,
"javac").compile(args);
- }
- catch (Throwable th)
- {
- System.err.println("INFORMATIONAL: Unable to
load Java compiler API (eg tools.jar).");
- System.err.println("\tSwitching to
command-line invocation.");
- cantLoadCompiler=true;
- }
+// try
+// {
+// return new
sun.tools.javac.Main(System.err, "javac").compile(args);
+// }
+// catch (Throwable th)
+// {
+// System.err.println("INFORMATIONAL: Unable
to load Java compiler API (eg tools.jar).");
+// System.err.println("\tSwitching to
command-line invocation.");
+// cantLoadCompiler=true;
+// }
}
// FALLTHRU:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]