jglick 2005/03/28 15:22:12
Modified: . WHATSNEW
docs/manual coretasklist.html tasksoverview.html
docs/manual/CoreTasks style.html
docs/manual/OptionalTasks dotnet.html
src/etc/testcases/taskdefs/optional xslt.xml
src/etc/testcases/taskdefs/style build.xml
src/main/org/apache/tools/ant/taskdefs DependSet.java
Javadoc.java XSLTProcess.java defaults.properties
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
WsdlToDotnet.java
src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional
XsltTest.java
Log:
#25832: deprecating the task names <WsdlToDotnet> and <style>.
Revision Changes Path
1.796 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- WHATSNEW 28 Mar 2005 21:43:18 -0000 1.795
+++ WHATSNEW 28 Mar 2005 23:22:10 -0000 1.796
@@ -79,6 +79,9 @@
Other changes:
--------------
+* <WsdlToDotnet> and <style> are now deprecated in favor of <wsdltodotnet>
and
+ <xslt>, respectively. Bugzilla report 25832.
+
* <echoproperties> now (alphanumerically) sorts the property list
before echoing. Bugzilla report 18976.
1.59 +1 -2 ant/docs/manual/coretasklist.html
Index: coretasklist.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/coretasklist.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- coretasklist.html 7 Mar 2005 18:38:26 -0000 1.58
+++ coretasklist.html 28 Mar 2005 23:22:11 -0000 1.59
@@ -84,7 +84,6 @@
<a href="CoreTasks/signjar.html">SignJar</a><br>
<a href="CoreTasks/sleep.html">Sleep</a><br>
<a href="CoreTasks/sql.html">Sql</a><br>
-<a href="CoreTasks/style.html">Style</a><br>
<a href="CoreTasks/subant.html">Subant</a><br>
<a href="CoreTasks/sync.html">Sync</a><br>
<a href="CoreTasks/tar.html">Tar</a><br>
@@ -102,7 +101,7 @@
<a href="CoreTasks/whichresource.html">WhichResource</a><br>
<a href="CoreTasks/war.html">War</a><br>
<a href="CoreTasks/xmlproperty.html">XmlProperty</a><br>
-<a href="CoreTasks/style.html">Xslt</a><br>
+<a href="CoreTasks/style.html">XSLT/<i>Style</i></a><br>
<a href="CoreTasks/zip.html">Zip</a><br>
</body>
</html>
1.30 +1 -1 ant/docs/manual/tasksoverview.html
Index: tasksoverview.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/tasksoverview.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tasksoverview.html 7 Mar 2005 18:38:26 -0000 1.29
+++ tasksoverview.html 28 Mar 2005 23:22:11 -0000 1.30
@@ -946,7 +946,7 @@
</tr>
<tr valign="top">
- <td nowrap><a href="CoreTasks/style.html">Xslt/Style</a></td>
+ <td nowrap><a href="CoreTasks/style.html">XSLT</a></td>
<td><p>Processes a set of documents via XSLT.</p></td>
</tr>
1.38 +3 -2 ant/docs/manual/CoreTasks/style.html
Index: style.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- style.html 15 Mar 2005 16:12:44 -0000 1.37
+++ style.html 28 Mar 2005 23:22:11 -0000 1.38
@@ -3,12 +3,13 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="../stylesheets/style.css"/>
-<title>Xslt/Style Task</title>
+<title>XSLT Task</title>
</head>
<body>
-<h2><a name="style">Xslt/Style</a></h2>
+<h2><a name="style">XSLT</a></h2>
+<p><em>The name <code>style</code> is a deprecated name for the same
task.</em></p>
<h3>Description</h3>
<p>Process a set of documents via XSLT.</p>
<p>This is useful for building views of XML based documentation,
1.24 +3 -3 ant/docs/manual/OptionalTasks/dotnet.html
Index: dotnet.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dotnet.html 11 Mar 2005 09:42:56 -0000 1.23
+++ dotnet.html 28 Mar 2005 23:22:11 -0000 1.24
@@ -69,7 +69,7 @@
<td><b>Description</b></td>
</tr>
<tr>
- <td><a href="csc.html">Csc</a></td>
+ <td><a href="csc.html">csc</a></td>
<td>Compiles C# code</td>
</tr>
@@ -94,12 +94,12 @@
</tr>
<tr>
- <td><a href="wsdltodotnet.html">WsdlToDotnet</a></td>
+ <td><a href="wsdltodotnet.html">wsdltodotnet</a></td>
<td>Generates .NET code (C# or VB) from a WSDL file</td>
</tr>
<tr>
- <td><a href="importtypelib.html">ImportTypelib</a></td>
+ <td><a href="importtypelib.html">importtypelib</a></td>
<td>Imports a COM type library into .NET</td>
</tr>
1.5 +10 -10 ant/src/etc/testcases/taskdefs/optional/xslt.xml
Index: xslt.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/xslt.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xslt.xml 12 Jul 2002 21:25:29 -0000 1.4
+++ xslt.xml 28 Mar 2005 23:22:11 -0000 1.5
@@ -10,11 +10,11 @@
</target>
<target name="testCatchNoDtd" depends="init">
- <style basedir="xml" destdir="xml/out"
+ <xslt basedir="xml" destdir="xml/out"
includes="about.xml"
extension=".txt"
style="xml/doc.xsl">
- </style>
+ </xslt>
</target>
<xmlcatalog id="xdocs.catalog">
@@ -23,42 +23,42 @@
</xmlcatalog>
<target name="testCatalog" depends="init">
- <style destdir="xml/out"
+ <xslt destdir="xml/out"
includes="about.xml"
extension=".txt"
style="xml/doc.xsl">
<xmlcatalog refid="xdocs.catalog"/>
- </style>
+ </xslt>
</target>
<target name="testOutputProperty" depends="init">
- <style in="xml/test.xml"
+ <xslt in="xml/test.xml"
out="xml/out/test-out.xml"
style="xml/test.xsl">
<outputproperty name="method" value="xml"/>
<outputproperty name="standalone" value="yes"/>
<outputproperty name="encoding" value="iso8859_1"/>
<outputproperty name="indent" value="yes"/>
- </style>
+ </xslt>
</target>
<target name="testFactory" depends="init">
- <style in="xml/test.xml"
+ <xslt in="xml/test.xml"
out="xml/out/test-out.xml"
style="xml/test.xsl">
<factory
name="org.apache.xalan.processor.TransformerFactoryImpl"/>
- </style>
+ </xslt>
</target>
<target name="testAttribute" depends="init">
- <style in="xml/test.xml"
+ <xslt in="xml/test.xml"
out="xml/out/test-out.xml"
style="xml/test.xsl">
<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
<attribute name="http://xml.apache.org/xalan/features/optimize";
value="true"/>
</factory>
- </style>
+ </xslt>
</target>
1.7 +18 -18 ant/src/etc/testcases/taskdefs/style/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/style/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 21 Mar 2005 15:02:04 -0000 1.6
+++ build.xml 28 Mar 2005 23:22:11 -0000 1.7
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="style-test" basedir="." default="nothing">
+<project name="xslt-test" basedir="." default="nothing">
<property name="out.dir" value="out"/>
@@ -13,74 +13,74 @@
</target>
<target name="testStyleIsSet">
- <style in="data.xml" out="${out.dir}/out.xml"/>
+ <xslt in="data.xml" out="${out.dir}/out.xml"/>
</target>
<target name="testTransferParameterSet">
<property name="value" value="myvalue"/>
- <style in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
<param name="set" expression="${value}"/>
- </style>
+ </xslt>
</target>
<target name="testTransferParameterEmpty">
<property name="value" value=""/>
- <style in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
<param name="empty" expression="${value}"/>
- </style>
+ </xslt>
</target>
<target name="testTransferParameterUnset">
- <style in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
<param name="undefined" expression="${value}"/>
- </style>
+ </xslt>
</target>
<target name="testTransferParameterUnsetWithIf">
- <style in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="printParams.xsl">
<param name="undefined" expression="${value}" if="value" />
- </style>
+ </xslt>
</target>
<target name="testDefaultMapper">
<property name="value" value="myvalue"/>
- <style style="printParams.xsl" destDir="${out.dir}" basedir=".">
+ <xslt style="printParams.xsl" destDir="${out.dir}" basedir=".">
<param name="set" expression="${value}"/>
- </style>
+ </xslt>
</target>
<target name="testCustomMapper">
<property name="value" value="myvalue"/>
- <style style="printParams.xsl" destDir="${out.dir}" basedir=".">
+ <xslt style="printParams.xsl" destDir="${out.dir}" basedir=".">
<param name="set" expression="${value}"/>
<mapper type="glob" from="data.*" to="out.*"/>
- </style>
+ </xslt>
</target>
<target name="testNewerStylesheet">
<antcall target="copyXsl">
<param name="xsl.value" value="old-value"/>
</antcall>
- <style in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
<antcall target="copyXsl">
<param name="xsl.value" value="new-value"/>
</antcall>
- <style in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
+ <xslt in="data.xml" out="${out.dir}/out.xml" style="tmp.xsl"/>
<delete file="tmp.xsl"/>
</target>
<target name="testDirectoryHierarchyWithDirMatching">
<mkdir dir="${out.dir}/src/level1/"/>
<copy file="data.xml" todir="${out.dir}/src/level1/"/>
- <style basedir="${out.dir}/src" destdir="${out.dir}/dest"
+ <xslt basedir="${out.dir}/src" destdir="${out.dir}/dest"
style="printParams.xsl"/>
</target>
<target name="testDirsWithSpaces">
<mkdir dir="${out.dir}/s rc/"/>
<copy file="data.xml" todir="${out.dir}/s rc/"/>
- <style basedir="${out.dir}/s rc" destdir="${out.dir}/d est"
+ <xslt basedir="${out.dir}/s rc" destdir="${out.dir}/d est"
style="printParams.xsl"/>
</target>
1.32 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java
Index: DependSet.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DependSet.java 9 Mar 2005 00:20:41 -0000 1.31
+++ DependSet.java 28 Mar 2005 23:22:11 -0000 1.32
@@ -35,7 +35,7 @@
* computed (for example, dynamically interpreted parameters or files
* that need to stay in synch but are not directly linked) or where
* the ant task in question could compute them but does not (for
- * example, the linked DTD for an XML file using the style task).
+ * example, the linked DTD for an XML file using the XSLT task).
*
* nested arguments:
* <ul>
1.139 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- Javadoc.java 21 Mar 2005 15:26:49 -0000 1.138
+++ Javadoc.java 28 Mar 2005 23:22:11 -0000 1.139
@@ -1639,7 +1639,7 @@
*/
public void execute() throws BuildException {
if ("javadoc2".equals(getTaskType())) {
- log("!! javadoc2 is deprecated. Use javadoc instead. !!");
+ log("Warning: the task name <javadoc2> is deprecated. Use
<javadoc> instead.", Project.MSG_WARN);
}
Vector packagesToDoc = new Vector();
1.94 +4 -0
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.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- XSLTProcess.java 21 Mar 2005 14:54:10 -0000 1.93
+++ XSLTProcess.java 28 Mar 2005 23:22:11 -0000 1.94
@@ -190,6 +190,10 @@
* @todo validate that if either in or our is defined, then both are
*/
public void execute() throws BuildException {
+ if ("style".equals(getTaskType())) {
+ log("Warning: the task name <style> is deprecated. Use <xslt>
instead.", Project.MSG_WARN);
+ }
+
File savedBaseDir = baseDir;
DirectoryScanner scanner;
1.167 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- defaults.properties 23 Mar 2005 16:51:42 -0000 1.166
+++ defaults.properties 28 Mar 2005 23:22:11 -0000 1.167
@@ -31,7 +31,6 @@
filter=org.apache.tools.ant.taskdefs.Filter
fixcrlf=org.apache.tools.ant.taskdefs.FixCRLF
patch=org.apache.tools.ant.taskdefs.Patch
-style=org.apache.tools.ant.taskdefs.XSLTProcess
xslt=org.apache.tools.ant.taskdefs.XSLTProcess
touch=org.apache.tools.ant.taskdefs.Touch
signjar=org.apache.tools.ant.taskdefs.SignJar
@@ -128,7 +127,6 @@
telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask
csc=org.apache.tools.ant.taskdefs.optional.dotnet.CSharp
ilasm=org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm
-WsdlToDotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet
wsdltodotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet
importtypelib=org.apache.tools.ant.taskdefs.optional.dotnet.ImportTypelib
stylebook=org.apache.tools.ant.taskdefs.optional.StyleBook
@@ -216,3 +214,5 @@
copyfile=org.apache.tools.ant.taskdefs.Copyfile
deltree=org.apache.tools.ant.taskdefs.Deltree
rename=org.apache.tools.ant.taskdefs.Rename
+WsdlToDotnet=org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet
+style=org.apache.tools.ant.taskdefs.XSLTProcess
1.30 +5 -0
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
Index: WsdlToDotnet.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- WsdlToDotnet.java 6 Jan 2005 12:05:03 -0000 1.29
+++ WsdlToDotnet.java 28 Mar 2005 23:22:12 -0000 1.30
@@ -22,6 +22,7 @@
import java.net.MalformedURLException;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.taskdefs.condition.Os;
@@ -275,6 +276,10 @@
*/
public void execute()
throws BuildException {
+ if ("WsdlToDotnet".equals(getTaskType())) {
+ log("Warning: the task name <WsdlToDotnet> is deprecated. Use
<wsdltodotnet> (all lowercase) instead.", Project.MSG_WARN);
+ }
+
if (compiler == null) {
compiler = Compiler.createDefaultCompiler();
}
1.15 +2 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StyleTest.java 21 Mar 2005 15:02:04 -0000 1.14
+++ StyleTest.java 28 Mar 2005 23:22:12 -0000 1.15
@@ -28,7 +28,8 @@
/**
- * TestCases for <style> / <xslt> task.
+ * TestCases for [EMAIL PROTECTED] XSLTProcess} task.
+ * XXX merge with [EMAIL PROTECTED] XsltTest}?
* @version 2003-08-05
*/
public class StyleTest extends BuildFileTest {
1.11 +2 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java
Index: XsltTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/XsltTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XsltTest.java 9 Mar 2004 16:49:01 -0000 1.10
+++ XsltTest.java 28 Mar 2005 23:22:12 -0000 1.11
@@ -19,8 +19,8 @@
import org.apache.tools.ant.BuildFileTest;
/**
- * Tests the style/xslt task.
- *
+ * Tests the [EMAIL PROTECTED] XSLTProcess} task.
+ * XXX merge with [EMAIL PROTECTED] StyleTest}?
* @since Ant 1.5
*/
public class XsltTest extends BuildFileTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
