Author: antoine
Date: Fri Feb 26 17:13:57 2010
New Revision: 916761
URL: http://svn.apache.org/viewvc?rev=916761&view=rev
Log:
removing the stylebook task
Removed:
ant/core/trunk/docs/manual/OptionalTasks/stylebook.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/build.xml
ant/core/trunk/docs/manual/install.html
ant/core/trunk/docs/manual/optionaltasklist.html
ant/core/trunk/docs/manual/tasksoverview.html
ant/core/trunk/src/etc/ant-bin.wxs
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Feb 26 17:13:57 2010
@@ -8,6 +8,8 @@
* Ant no longer ships with Apache Xerces-J or the XML APIs but relies
on the Java runtime to provide a parser and matching API versions.
+
+ * The stylebook ant task and the ant-stylebook.jar are removed.
Fixed bugs:
-----------
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Fri Feb 26 17:13:57 2010
@@ -227,10 +227,6 @@
</or>
</selector>
- <selector id="needs.stylebook">
- <filename name="${optional.package}/StyleBook*"/>
- </selector>
-
<selector id="needs.javamail">
<or>
<filename name="${ant.package}/taskdefs/email/MimeMailer*"/>
@@ -365,9 +361,6 @@
<available property="antlr.present"
classname="antlr.Tool"
classpathref="classpath"/>
- <available property="stylebook.present"
- classname="org.apache.stylebook.Engine"
- classpathref="classpath"/>
<available property="apache.regexp.present"
classname="org.apache.regexp.RE"
classpathref="classpath"/>
@@ -547,7 +540,6 @@
<selector refid="needs.commons-logging"
unless="commons.logging.present"/>
<selector refid="needs.apache-bsf" unless="bsf.present"/>
- <selector refid="needs.stylebook" unless="stylebook.present"/>
<selector refid="needs.javamail" unless="javamail.complete"/>
<selector refid="needs.netrexx" unless="netrexx.present"/>
<selector refid="needs.commons-net" unless="commons.net.present"/>
@@ -727,7 +719,6 @@
<selector refid="needs.apache-log4j"/>
<selector refid="needs.commons-logging"/>
<selector refid="needs.apache-bsf"/>
- <selector refid="needs.stylebook"/>
<selector refid="needs.javamail"/>
<selector refid="needs.netrexx"/>
<selector refid="needs.commons-net"/>
@@ -767,7 +758,6 @@
<optional-jar dep="apache-log4j"/>
<optional-jar dep="commons-logging"/>
<optional-jar dep="apache-bsf"/>
- <optional-jar dep="stylebook"/>
<optional-jar dep="javamail"/>
<optional-jar dep="netrexx"/>
<optional-jar dep="commons-net"/>
Modified: ant/core/trunk/docs/manual/install.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/install.html?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/install.html (original)
+++ ant/core/trunk/docs/manual/install.html Fri Feb 26 17:13:57 2010
@@ -723,11 +723,6 @@
<td><a href="http://xml.apache.org/xalan-j/";
target="_top">http://xml.apache.org/xalan-j/</a></td>
</tr>
<tr>
- <td>stylebook.jar</td>
- <td>stylebook task</td>
- <td>SVN repository of <a href="http://xml.apache.org/svn.html";
target="_top">http://xml.apache.org/svn.html</a></td>
- </tr>
- <tr>
<td>antlr.jar</td>
<td>antlr task</td>
<td><a href="http://www.antlr.org/";
target="_top">http://www.antlr.org/</a></td>
Modified: ant/core/trunk/docs/manual/optionaltasklist.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/optionaltasklist.html?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/optionaltasklist.html (original)
+++ ant/core/trunk/docs/manual/optionaltasklist.html Fri Feb 26 17:13:57 2010
@@ -81,7 +81,6 @@
<li><a href="OptionalTasks/sshexec.html">Sshexec</a></li>
<li><a href="OptionalTasks/sshsession.html">Sshsession</a></li>
<li><a href="OptionalTasks/starteam.html">Starteam Tasks</a></li>
-<li><a href="OptionalTasks/stylebook.html"><i>Stylebook</i></a></li>
<li><a href="OptionalTasks/symlink.html">Symlink</a></li>
<li><a href="OptionalTasks/telnet.html">Telnet</a></li>
<li><a href="OptionalTasks/translate.html">Translate</a></li>
Modified: ant/core/trunk/docs/manual/tasksoverview.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/tasksoverview.html?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/tasksoverview.html (original)
+++ ant/core/trunk/docs/manual/tasksoverview.html Fri Feb 26 17:13:57 2010
@@ -315,12 +315,6 @@
The Javadoc2 task is deprecated; use the Javadoc task instead.</p></td>
</tr>
- <tr valign="top">
- <td nowrap><a href="OptionalTasks/stylebook.html">Stylebook</a></td>
- <td><p>Executes the Apache Stylebook documentation generator.
- Unlike the command-line version of this tool, all three arguments
- are required to run the Stylebook task.</p></td>
- </tr>
</table>
<p></p>
Modified: ant/core/trunk/src/etc/ant-bin.wxs
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/ant-bin.wxs?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/src/etc/ant-bin.wxs (original)
+++ ant/core/trunk/src/etc/ant-bin.wxs Fri Feb 26 17:13:57 2010
@@ -51,12 +51,11 @@
<File DiskId="1" Id="file16" Name="ANT-NE_1.JAR"
LongName="ant-netrexx.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant-netrexx.jar" />
<File DiskId="1" Id="file17" Name="ANT-NO_1.JAR"
LongName="ant-nodeps.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-nodeps.jar"
/>
<File DiskId="1" Id="file18" Name="ANT-ST_2.JAR"
LongName="ant-starteam.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant-starteam.jar" />
- <File DiskId="1" Id="file19" Name="ANT-ST_1.JAR"
LongName="ant-stylebook.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant-stylebook.jar" />
- <File DiskId="1" Id="file20" Name="ANT-SW_1.JAR"
LongName="ant-swing.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-swing.jar" />
- <File DiskId="1" Id="file22" Name="ANT-WE_1.JAR"
LongName="ant-weblogic.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant-weblogic.jar" />
- <File DiskId="1" Id="file24" Name="ant.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant.jar" />
- <File DiskId="1" Id="file25" Name="LIBRAR_1.PRO"
LongName="libraries.properties" Vital="yes"
src="$(var.dist.dir)/lib\libraries.properties" />
- <File DiskId="1" Id="file26" Name="README" Vital="yes"
src="$(var.dist.dir)/lib\README" />
+ <File DiskId="1" Id="file19" Name="ANT-SW_1.JAR"
LongName="ant-swing.jar" Vital="yes" src="$(var.dist.dir)/lib\ant-swing.jar" />
+ <File DiskId="1" Id="file20" Name="ANT-WE_1.JAR"
LongName="ant-weblogic.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant-weblogic.jar" />
+ <File DiskId="1" Id="file21" Name="ant.jar" Vital="yes"
src="$(var.dist.dir)/lib\ant.jar" />
+ <File DiskId="1" Id="file22" Name="LIBRAR_1.PRO"
LongName="libraries.properties" Vital="yes"
src="$(var.dist.dir)/lib\libraries.properties" />
+ <File DiskId="1" Id="file23" Name="README" Vital="yes"
src="$(var.dist.dir)/lib\README" />
</Component>
</Directory>
<Directory Id="directory1" Name="bin">
@@ -393,7 +392,6 @@
<File DiskId="1" Id="file572" Name="SPLASH_1.HTM"
LongName="splash.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\splash.html" />
<File DiskId="1" Id="file573" Name="SSHEXE_1.HTM"
LongName="sshexec.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\sshexec.html" />
<File DiskId="1" Id="file574" Name="STARTE_1.HTM"
LongName="starteam.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\starteam.html" />
- <File DiskId="1" Id="file575" Name="STYLEB_1.HTM"
LongName="stylebook.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\stylebook.html" />
<File DiskId="1" Id="file576" Name="SYMLIN_1.HTM"
LongName="symlink.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\symlink.html" />
<File DiskId="1" Id="file577" Name="TELNET_1.HTM"
LongName="telnet.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\telnet.html" />
<File DiskId="1" Id="file578" Name="TRANSL_1.HTM"
LongName="translate.html" Vital="yes"
src="$(var.dist.dir)/docs\manual\OptionalTasks\translate.html" />
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties?rev=916761&r1=916760&r2=916761&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Fri Feb 26 17:13:57 2010
@@ -195,7 +195,6 @@
stcheckout=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckout
stlabel=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel
stlist=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamList
-stylebook=org.apache.tools.ant.taskdefs.optional.StyleBook
symlink=org.apache.tools.ant.taskdefs.optional.unix.Symlink
telnet=org.apache.tools.ant.taskdefs.optional.net.TelnetTask
translate=org.apache.tools.ant.taskdefs.optional.i18n.Translate
