jhm 2003/09/06 01:50:20
Modified: docs resources.html
docs/manual/api index.html packages.html
src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
xdocs resources.xml
Log:
spell check
Revision Changes Path
1.65 +1 -1 ant/docs/resources.html
Index: resources.html
===================================================================
RCS file: /home/cvs/ant/docs/resources.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- resources.html 17 Jul 2003 11:05:15 -0000 1.64
+++ resources.html 6 Sep 2003 08:50:19 -0000 1.65
@@ -220,7 +220,7 @@
<a name="FAQ about Borland Application Server tasks"></a>
FAQ about Borland Application Server tasks
</h4>
- <p>Benoit Moussaud, the original author if the
Borland
+ <p>Benoit Moussaud, the original author of the
Borland
Application Server specific <a
href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
together a FAQ for this specific subtask.</p>
<table class="externals"
cellspacing="1" cellpadding="4">
1.5 +25 -10 ant/docs/manual/api/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/api/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.html 30 Oct 2001 10:05:39 -0000 1.4
+++ index.html 6 Sep 2003 08:50:20 -0000 1.5
@@ -1,11 +1,26 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="1; URL=packages.html">
-<title>Apache Ant API</title>
-</head>
-<body>
-Redirecting to <a href="packages.html">Apache Ant API ...</a>
-</body>
-</html>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
"http://www.w3.org/TR/html4/frameset.dtd";>
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc on Sat Sep 06 10:24:18 CEST 2003-->
+<TITLE>
+Apache Ant API
+</TITLE>
+</HEAD>
+<FRAMESET cols="20%,80%">
+<FRAMESET rows="30%,70%">
+<FRAME src="overview-frame.html" name="packageListFrame" title="All
Packages">
+<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes
and interfaces (except non-static nested types)">
+</FRAMESET>
+<FRAME src="overview-summary.html" name="classFrame" title="Package, class
and interface descriptions">
+<NOFRAMES>
+<H2>
+Frame Alert</H2>
+<P>
+This document is designed to be viewed using the frames feature. If you see
this message, you are using a non-frame-capable web client.
+<BR>
+Link to<A HREF="overview-summary.html">Non-frame version.</A>
+</NOFRAMES>
+</FRAMESET>
+</HTML>
1.8 +34 -19 ant/docs/manual/api/packages.html
Index: packages.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/api/packages.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- packages.html 19 Feb 2003 09:23:19 -0000 1.7
+++ packages.html 6 Sep 2003 08:50:20 -0000 1.8
@@ -1,22 +1,37 @@
-<html>
-<head>
-<title>Apache Ant API</title>
-</head>
-<body>
-<b>Apache Ant API has not been generated</b>
-
-<p>If you see this page online at <a
-href="http://ant.apache.org";>ant.apache.org</a>, it is not a bug, but
-on purpose. We do not provide an online version of the API docs, they
-are included with all our distributions, including the nightly
-builds.</p>
-
-<p>If you want to see the API docs for the latest code, they are
-generated by <a href="http://jakarta.apache.org/gump/";>Apache Gump</a>
-and linked from <a
-href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/index.html";>http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/index.html</a>.</p>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.4.2) on Sat Sep 06 10:24:18 CEST 2003 -->
+<TITLE>
+ (Apache Ant API)
+</TITLE>
-</body>
-</html>
+<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+ parent.document.title=" (Apache Ant API)";
+}
+</SCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+<BR>
+
+<BR>
+
+<BR>
+<CENTER>
+The front page has been relocated.Please see:
+<BR>
+ <A
HREF="index.html">Frame version</A>
+<BR>
+ <A
HREF="overview-summary.html">Non-frame version.</A></CENTER>
+
+</BODY>
+</HTML>
1.73 +12 -3
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- XSLTProcess.java 5 Aug 2003 16:01:10 -0000 1.72
+++ XSLTProcess.java 6 Sep 2003 08:50:20 -0000 1.73
@@ -226,6 +226,9 @@
((XSLTLoggerAware) liaison).setLogger(this);
}
+ Class cl = liaison.getClass();
+ String s = cl.toString();
+
log("Using " + liaison.getClass().toString(),
Project.MSG_VERBOSE);
File stylesheet = getProject().resolveFile(xslFile);
@@ -566,22 +569,27 @@
protected XSLTLiaison getLiaison() {
// if processor wasn't specified, see if TraX is available. If not,
// default it to xslp or xalan, depending on which is in the
classpath
+ Class cl = null;
if (liaison == null) {
if (processor != null) {
try {
resolveProcessor(processor);
+ cl = liaison.getClass();
} catch (Exception e) {
throw new BuildException(e);
}
} else {
try {
resolveProcessor("trax");
+ cl = liaison.getClass();
} catch (Throwable e1) {
try {
resolveProcessor("xalan");
+ cl = liaison.getClass();
} catch (Throwable e2) {
try {
resolveProcessor("xslp");
+ cl = liaison.getClass();
} catch (Throwable e3) {
e3.printStackTrace();
e2.printStackTrace();
@@ -591,6 +599,7 @@
}
}
}
+ cl = liaison.getClass();
return liaison;
}
@@ -701,7 +710,7 @@
&& project.getProperty(unlessProperty) != null) {
return false;
}
-
+
return true;
}
} // Param
@@ -953,4 +962,4 @@
} // -- class Factory
-} //-- XSLTProcess
+} //-- XSLTProcess
\ No newline at end of file
1.4 +56 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
Index: StyleTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StyleTest.java 21 Aug 2003 18:14:30 -0000 1.3
+++ StyleTest.java 6 Sep 2003 08:50:20 -0000 1.4
@@ -61,6 +61,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
+import java.io.FileWriter;
/**
@@ -112,6 +113,60 @@
"undefined='undefined default value'");
}
+ public void testNewerStylesheet() throws Exception {
+ File xmlFile = new File("testNewerStylesheet.xml");
+ File xslFile = new File("testNewerStylesheet.xsl");
+ File outFile = new File("testNewerStylesheet.out");
+
+ // create the first version of xml and xsl
+ String xml = "<data/>";
+ StringBuffer xslHeader = new StringBuffer();
+ StringBuffer xslFooter = new StringBuffer();
+ xslHeader.append("<?xml version=\"1.0\"?>");
+ xslHeader.append("<xsl:stylesheet");
+ xslHeader.append(" version=\"1.0\"");
+ xslHeader.append("
xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\";>");
+ xslHeader.append("<xsl:template match=\"/\">");
+ xslFooter.append("</xsl:template>");
+ xslFooter.append("</xsl:stylesheet>");
+
+ FileWriter xmlWriter = new FileWriter(xmlFile);
+ xmlWriter.write(xml);
+ xmlWriter.close();
+
+ FileWriter xslWriter = new FileWriter(xslFile);
+ xslWriter.write(xslHeader.toString());
+ xslWriter.write("old-string");
+ xslWriter.write(xslFooter.toString());
+ xslWriter.close();
+
+ // make the first transformation
+ XSLTProcess xslt = new XSLTProcess();
+ xslt.setProject(getProject());
+ System.out.println("Project : " + getProject());
+ xslt.setBasedir(getProject().getBaseDir());
+ xslt.setStyle(xslFile.toString());
+ xslt.setOut(outFile);
+ xslt.setIn(xmlFile);
+ xslt.execute();
+
+ // modify the xsl
+ xslWriter = new FileWriter(xslFile);
+ xslWriter.write(xslHeader.toString());
+ xslWriter.write("new-string");
+ xslWriter.write(xslFooter.toString());
+ xslWriter.close();
+ xslt.perform();
+
+ // make the second transformation
+
+
+ // test for 2nd transformation
+ xmlFile.delete();
+ xslFile.delete();
+ outFile.delete();
+ }
+
// ************* copied from ConcatTest *************
@@ -151,4 +206,4 @@
" but got " + content, content.indexOf(contains) > -1);
}
-}
+}
\ No newline at end of file
1.30 +2 -2 ant/xdocs/resources.xml
Index: resources.xml
===================================================================
RCS file: /home/cvs/ant/xdocs/resources.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- resources.xml 17 Jul 2003 11:05:16 -0000 1.29
+++ resources.xml 6 Sep 2003 08:50:20 -0000 1.30
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<document>
<properties>
@@ -38,7 +38,7 @@
</subsection>
<subsection name="FAQ about Borland Application Server tasks">
- <p>Benoit Moussaud, the original author if the Borland
+ <p>Benoit Moussaud, the original author of the Borland
Application Server specific <a
href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
together a FAQ for this specific subtask.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
