diff --git a/WHATSNEW b/WHATSNEW index 40aed22ee..a95ba0122 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -8,6 +8,8 @@ Changes that could break older environments: * 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: ----------- diff --git a/build.xml b/build.xml index 53d6c283d..aea1df86c 100644 --- a/build.xml +++ b/build.xml @@ -227,10 +227,6 @@ - - - - @@ -365,9 +361,6 @@ - @@ -547,7 +540,6 @@ - @@ -727,7 +719,6 @@ - @@ -767,7 +758,6 @@ - diff --git a/docs/manual/OptionalTasks/stylebook.html b/docs/manual/OptionalTasks/stylebook.html deleted file mode 100644 index ff4cd8ab6..000000000 --- a/docs/manual/OptionalTasks/stylebook.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - -StyleBook Task - - - - -

Stylebook

-

Description

- -This task is deprecated as stylebook itself has been -deprecated by the Apache XML community. - -

This executes the apache Stylebook documentation generator. -Unlike the commandline version of this tool, all three arguments -are required to run stylebook.

-

Note: This task depends on external libraries not included in the Ant distribution. -See Library Dependencies for more information.

-

- Being extended from <Java>, all the parent's attributes - and options are available. Do not set any apart from the classpath - as they are not guaranteed to be there in future. -

- -

Parameters

- - - - - - - - - - - - - - - - - - - - - -
AttributeDescriptionRequired
bookthe book xml file that the documentation generation starts from - Yes
skindirectorythe directory that contains the stylebook skin - Yes
targetdirectorythe destination directory where the documentation is generated - Yes
-

-The user can also specify the nested <classpath> element which defines classpath -in which the task is executed.

- -

Examples

-
-
-<stylebook targetdirectory="build/docs" 
-           book="src/xdocs/book.xml" 
-           skindirectory="src/skins/myskin"/>
-
-
-The above will generate documentation in build/docs starting from the book -src/xdocs/book.xml and using the skin located in directory src/skins/myskin. - - - - - - diff --git a/docs/manual/install.html b/docs/manual/install.html index 3f731cdb9..18a719c3e 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -722,11 +722,6 @@ you need jakarta-oro 2.0.8 or later, and commons-net< junitreport task http://xml.apache.org/xalan-j/ - - stylebook.jar - stylebook task - SVN repository of http://xml.apache.org/svn.html - antlr.jar antlr task diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html index b36c43795..6a7f86488 100644 --- a/docs/manual/optionaltasklist.html +++ b/docs/manual/optionaltasklist.html @@ -81,7 +81,6 @@
  • Sshexec
  • Sshsession
  • Starteam Tasks
  • -
  • Stylebook
  • Symlink
  • Telnet
  • Translate
  • diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html index 06569b3b7..f2efafddd 100644 --- a/docs/manual/tasksoverview.html +++ b/docs/manual/tasksoverview.html @@ -315,12 +315,6 @@ documentation.

    The Javadoc2 task is deprecated; use the Javadoc task instead.

    - - Stylebook -

    Executes the Apache Stylebook documentation generator. - Unlike the command-line version of this tool, all three arguments - are required to run the Stylebook task.

    -

    diff --git a/src/etc/ant-bin.wxs b/src/etc/ant-bin.wxs index 87467c4f7..eddb24461 100644 --- a/src/etc/ant-bin.wxs +++ b/src/etc/ant-bin.wxs @@ -51,12 +51,11 @@ - - - - - - + + + + + @@ -393,7 +392,6 @@ - diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index 43d4bce3f..75be825e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -195,7 +195,6 @@ stcheckin=org.apache.tools.ant.taskdefs.optional.starteam.StarTeamCheckin 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 diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java deleted file mode 100644 index cd4e6ed37..000000000 --- a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.tools.ant.taskdefs.optional; - -import java.io.File; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.Java; - -/** - * Executes the Apache Stylebook documentation generator. - * Unlike the commandline version of this tool, all three arguments - * are required to run stylebook. - *

    - * Being extended from <Java>, all the parent's attributes - * and options are available. Do not set any apart from the classpath - * as they are not guaranteed to be there in future. - * @todo stop extending from Java. - * @deprecated since 1.7. - * This task is considered unsupported by the Ant developers - */ -public class StyleBook extends Java { - // CheckStyle:VisibilityModifier OFF - bc - // CheckStyle:MemberNameCheck OFF - bc - protected File m_targetDirectory; - protected File m_skinDirectory; - protected String m_loaderConfig; - protected File m_book; - // CheckStyle:MemberNameCheck ON - // CheckStyle:VisibilityModifier ON - - - /** - * Constructor - */ - public StyleBook() { - setClassname("org.apache.stylebook.StyleBook"); - setFork(true); - setFailonerror(true); - } - - /** - * Set the book xml file that the documentation generation starts from; - * required. - * @param book the source file - */ - - public void setBook(final File book) { - m_book = book; - } - - - /** - * Set the directory that contains the stylebook skin; - * required. - * @param skinDirectory the location of the stylebook skin - */ - public void setSkinDirectory(final File skinDirectory) { - m_skinDirectory = skinDirectory; - } - - - /** - * Set the destination directory where the documentation is generated; - * required. - * @param targetDirectory the document output directory - */ - public void setTargetDirectory(final File targetDirectory) { - m_targetDirectory = targetDirectory; - } - - /** - * A loader configuration to send to stylebook; optional. - * @param loaderConfig the configuration to use. - */ - public void setLoaderConfig(final String loaderConfig) { - m_loaderConfig = loaderConfig; - } - - - /** - * call the program - * @throws BuildException if there is a problem. - */ - public void execute() - throws BuildException { - - if (null == m_targetDirectory) { - throw new BuildException("TargetDirectory attribute not set."); - } - - if (null == m_skinDirectory) { - throw new BuildException("SkinDirectory attribute not set."); - } - - if (null == m_book) { - throw new BuildException("book attribute not set."); - } - - createArg().setValue("targetDirectory=" + m_targetDirectory); - createArg().setValue(m_book.toString()); - createArg().setValue(m_skinDirectory.toString()); - if (null != m_loaderConfig) { - createArg().setValue("loaderConfig=" + m_loaderConfig); - } - - super.execute(); - } -}