Author: bodewig Date: Wed Mar 26 12:36:59 2008 New Revision: 641508 URL: http://svn.apache.org/viewvc?rev=641508&view=rev Log: Add license and fix line-ends
Modified: ant/sandbox/antlibs/manual4eclipse/build.properties (contents, props changed) ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html (contents, props changed) ant/sandbox/antlibs/manual4eclipse/docs/cover.html (contents, props changed) ant/sandbox/antlibs/manual4eclipse/docs/index.html (contents, props changed) ant/sandbox/antlibs/manual4eclipse/docs/m4e.html (contents, props changed) ant/sandbox/antlibs/manual4eclipse/docs/toc.html (contents, props changed) ant/sandbox/antlibs/manual4eclipse/libraries.properties ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml (contents, props changed) ant/sandbox/antlibs/manual4eclipse/src/manual170.patch (contents, props changed) Modified: ant/sandbox/antlibs/manual4eclipse/build.properties URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/build.properties?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/build.properties (original) +++ ant/sandbox/antlibs/manual4eclipse/build.properties Wed Mar 26 12:36:59 2008 @@ -1,6 +1,20 @@ -# Overwrite JavaC properties -# This AntLib is not part of the Core and only intended for building -# an Eclipse help plugin from the manual. This AntLib was not designed -# for other use. So we could use Java5 here (instead of 1.2). -javac.-source=1.5 -javac.-target=1.5 +# 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. +# Overwrite JavaC properties +# This AntLib is not part of the Core and only intended for building +# an Eclipse help plugin from the manual. This AntLib was not designed +# for other use. So we could use Java5 here (instead of 1.2). +javac.-source=1.5 +javac.-target=1.5 Propchange: ant/sandbox/antlibs/manual4eclipse/build.properties ------------------------------------------------------------------------------ svn.eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html (original) +++ ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html Wed Mar 26 12:36:59 2008 @@ -1,98 +1,98 @@ -<!-- - 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. ---> -<html> - -<head> -<meta http-equiv="Content-Language" content="en-us"> -<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>BuildPlugin Task</title> -</head> - -<body> - - - -<h2><a name="m4e">BuildPlugin</a></h2> -<h3>Description</h3> -<p> -Building an Eclipse Help plugin is more than creating a <i>toc.xml</i> and a <i>plugin.xml</i>. -You have to collect all needed files in the needed file structure and create a JAR with OSGi bundle -information. Also references between the files should not be go outside the structure in a relative way (you could use links like <i>http://ant.apache.org</i> but no <i>../images</i>). The makro <i>buildPlugin</i> does this work. -</p> -<p> -Mainly the <i>cover.html</i> from the Ant Manual loads an image from the site directory (../images). -The link will be modified an the graphic will be copied. -</p> - - - -<h3>Parameters</h3> -<table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td valign="top"><b>Attribute</b></td> - <td valign="top"><b>Description</b></td> - <td align="center" valign="top"><b>Required</b></td> - </tr> - <tr> - <td valign="top">manualDir</td> - <td valign="top">The directory where Ant's manual is.</td> - <td align="center" valign="top">Yes</td> - </tr> - <tr> - <td valign="top">antVersion</td> - <td valign="top">The version of Ant's Manual.</td> - <td align="center" valign="top">Yes</td> - </tr> - <tr> - <td valign="top">buildDir</td> - <td valign="top">Where to build the artefacts.</td> - <td align="center" valign="top">Yes</i></td> - </tr> - <tr> - <td valign="top">pluginDir</td> - <td valign="top">Whether to generate the plugin files.</td> - <td align="center" valign="top">No, default "@{buildDir}/manual4eclipse"</i></td> - </tr> - <tr> - <td valign="top">pluginPackage</td> - <td valign="top">In which package should the plugin reside.</td> - <td align="center" valign="top">No, default "org.apache.ant.manual"</i></td> - </tr> -</table> - - - -<h3>Examples</h3> -<pre> -<target name="gen" xmlns:m4e="antlib:org.apache.ant.manual4eclipse"> - <property name="build" value="build"/> - <property name="ant.trunk" location="path/to/my/svn/checkout/of/Ant/Core"/> - <mkdir dir="${build}"/> - <m4e:buildPlugin manualDir="${ant.trunk}/docs/manual" - antVersion="1.7.1alpha" - buildDir="${build}" - /> -</target> -</pre> -This target generates an Eclipse Help plugin <i>org.apache.ant.manual_1.7.1alpha.v20070301.jar</i> -(with 20070301 as timestamp) into <i>build</i> with the plugin files and the html manual from -<i>path/to/my/svn/checkout/of/Ant/Core/docs/manual</i>. - - - -</body> -</html> +<!-- + 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. +--> +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> +<title>BuildPlugin Task</title> +</head> + +<body> + + + +<h2><a name="m4e">BuildPlugin</a></h2> +<h3>Description</h3> +<p> +Building an Eclipse Help plugin is more than creating a <i>toc.xml</i> and a <i>plugin.xml</i>. +You have to collect all needed files in the needed file structure and create a JAR with OSGi bundle +information. Also references between the files should not be go outside the structure in a relative way (you could use links like <i>http://ant.apache.org</i> but no <i>../images</i>). The makro <i>buildPlugin</i> does this work. +</p> +<p> +Mainly the <i>cover.html</i> from the Ant Manual loads an image from the site directory (../images). +The link will be modified an the graphic will be copied. +</p> + + + +<h3>Parameters</h3> +<table border="1" cellpadding="2" cellspacing="0"> + <tr> + <td valign="top"><b>Attribute</b></td> + <td valign="top"><b>Description</b></td> + <td align="center" valign="top"><b>Required</b></td> + </tr> + <tr> + <td valign="top">manualDir</td> + <td valign="top">The directory where Ant's manual is.</td> + <td align="center" valign="top">Yes</td> + </tr> + <tr> + <td valign="top">antVersion</td> + <td valign="top">The version of Ant's Manual.</td> + <td align="center" valign="top">Yes</td> + </tr> + <tr> + <td valign="top">buildDir</td> + <td valign="top">Where to build the artefacts.</td> + <td align="center" valign="top">Yes</i></td> + </tr> + <tr> + <td valign="top">pluginDir</td> + <td valign="top">Whether to generate the plugin files.</td> + <td align="center" valign="top">No, default "@{buildDir}/manual4eclipse"</i></td> + </tr> + <tr> + <td valign="top">pluginPackage</td> + <td valign="top">In which package should the plugin reside.</td> + <td align="center" valign="top">No, default "org.apache.ant.manual"</i></td> + </tr> +</table> + + + +<h3>Examples</h3> +<pre> +<target name="gen" xmlns:m4e="antlib:org.apache.ant.manual4eclipse"> + <property name="build" value="build"/> + <property name="ant.trunk" location="path/to/my/svn/checkout/of/Ant/Core"/> + <mkdir dir="${build}"/> + <m4e:buildPlugin manualDir="${ant.trunk}/docs/manual" + antVersion="1.7.1alpha" + buildDir="${build}" + /> +</target> +</pre> +This target generates an Eclipse Help plugin <i>org.apache.ant.manual_1.7.1alpha.v20070301.jar</i> +(with 20070301 as timestamp) into <i>build</i> with the plugin files and the html manual from +<i>path/to/my/svn/checkout/of/Ant/Core/docs/manual</i>. + + + +</body> +</html> Propchange: ant/sandbox/antlibs/manual4eclipse/docs/buildPlugin.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/docs/cover.html URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/docs/cover.html?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/docs/cover.html (original) +++ ant/sandbox/antlibs/manual4eclipse/docs/cover.html Wed Mar 26 12:36:59 2008 @@ -1,18 +1,34 @@ -<html> - -<head> -<meta http-equiv="Content-Language" content="en-us"> -<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>Antlib Manual4Eclipse</title> -</head> - -<body> - -<h2>Antlib Manual4Eclipse</h2> - - -<p>This AntLib provides tasks for generating an Eclipse Help PlugIn from Ant's manual.</p> - - -</body> -</html> +<!-- + 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. +--> +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> +<title>Antlib Manual4Eclipse</title> +</head> + +<body> + +<h2>Antlib Manual4Eclipse</h2> + + +<p>This AntLib provides tasks for generating an Eclipse Help PlugIn from Ant's manual.</p> + + +</body> +</html> Propchange: ant/sandbox/antlibs/manual4eclipse/docs/cover.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/docs/index.html URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/docs/index.html?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/docs/index.html (original) +++ ant/sandbox/antlibs/manual4eclipse/docs/index.html Wed Mar 26 12:36:59 2008 @@ -1,18 +1,34 @@ -<html> - -<head> -<meta http-equiv="Content-Language" content="en-us"> -<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>User Manual - Antlib Manual4Eclipse</title> -</head> - -<frameset cols="26%,74%"> - <frame src="toc.html" name="navFrame"> - <frame src="cover.html" name="mainFrame"> -</frameset> -<noframes> - <H2>User Manual - Antlib Manual4Eclipse</H2> - <a href="toc.html">User Manual - Antlib Manual4Eclipse</a> -</noframes> - -</html> +<!-- + 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. +--> +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> +<title>User Manual - Antlib Manual4Eclipse</title> +</head> + +<frameset cols="26%,74%"> + <frame src="toc.html" name="navFrame"> + <frame src="cover.html" name="mainFrame"> +</frameset> +<noframes> + <H2>User Manual - Antlib Manual4Eclipse</H2> + <a href="toc.html">User Manual - Antlib Manual4Eclipse</a> +</noframes> + +</html> Propchange: ant/sandbox/antlibs/manual4eclipse/docs/index.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/docs/m4e.html URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/docs/m4e.html?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/docs/m4e.html (original) +++ ant/sandbox/antlibs/manual4eclipse/docs/m4e.html Wed Mar 26 12:36:59 2008 @@ -1,79 +1,79 @@ -<!-- - 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. ---> -<html> - -<head> -<meta http-equiv="Content-Language" content="en-us"> -<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>M4E Task</title> -</head> - -<body> - - - -<h2><a name="m4e">M4E</a></h2> -<h3>Description</h3> -<p> -The m4e task scans the Ant manual table of content files by starting from a given file. -It acts like a spider. The task is dependent on the frame structure of the manual because -it uses all pages opened in the left navigation frame <i>navFrame</i> as references toc file. -There are build-in ignore lists, but they are not changeable from outside at the moment. -</p> -<p> -With the scanned information it generates a <i>toc.xml</i> which is needed for -<a target="_blank" href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_help_toc.html">Eclipse Help</a>. It writes a plugin.xml with static content, too. -</p> - - - -<h3>Parameters</h3> -<table border="1" cellpadding="2" cellspacing="0"> - <tr> - <td valign="top"><b>Attribute</b></td> - <td valign="top"><b>Description</b></td> - <td align="center" valign="top"><b>Required</b></td> - </tr> - <tr> - <td valign="top">dir</td> - <td valign="top">The directory where to generate the files.</td> - <td align="center" valign="top">yes</td> - </tr> - <tr> - <td valign="top">manualDir</td> - <td valign="top">The directory where Ant's manual is.</td> - <td align="center" valign="top">yes</td> - </tr> -</table> - - - -<h3>Examples</h3> -<pre> -<target name="gen" xmlns:m4e="antlib:org.apache.ant.manual4eclipse"> - <property name="build" value="build"/> - <property name="ant.trunk" location="path/to/my/svn/checkout/of/Ant/Core"/> - <mkdir dir="${build}"/> - <m4e:m4e dir="${build}" manualDir="${ant.trunk}/docs/manual"/> -</target> -</pre> -This target reads the data from Ant's manual living in <i>path/to/my/svn/checkout/of/Ant/Core/docs/manual</i> and generates a <i>toc.xml</i> and a <i>plugin.xml</i> to <i>build</i>. - - - -</body> -</html> +<!-- + 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. +--> +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> +<title>M4E Task</title> +</head> + +<body> + + + +<h2><a name="m4e">M4E</a></h2> +<h3>Description</h3> +<p> +The m4e task scans the Ant manual table of content files by starting from a given file. +It acts like a spider. The task is dependent on the frame structure of the manual because +it uses all pages opened in the left navigation frame <i>navFrame</i> as references toc file. +There are build-in ignore lists, but they are not changeable from outside at the moment. +</p> +<p> +With the scanned information it generates a <i>toc.xml</i> which is needed for +<a target="_blank" href="http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_help_toc.html">Eclipse Help</a>. It writes a plugin.xml with static content, too. +</p> + + + +<h3>Parameters</h3> +<table border="1" cellpadding="2" cellspacing="0"> + <tr> + <td valign="top"><b>Attribute</b></td> + <td valign="top"><b>Description</b></td> + <td align="center" valign="top"><b>Required</b></td> + </tr> + <tr> + <td valign="top">dir</td> + <td valign="top">The directory where to generate the files.</td> + <td align="center" valign="top">yes</td> + </tr> + <tr> + <td valign="top">manualDir</td> + <td valign="top">The directory where Ant's manual is.</td> + <td align="center" valign="top">yes</td> + </tr> +</table> + + + +<h3>Examples</h3> +<pre> +<target name="gen" xmlns:m4e="antlib:org.apache.ant.manual4eclipse"> + <property name="build" value="build"/> + <property name="ant.trunk" location="path/to/my/svn/checkout/of/Ant/Core"/> + <mkdir dir="${build}"/> + <m4e:m4e dir="${build}" manualDir="${ant.trunk}/docs/manual"/> +</target> +</pre> +This target reads the data from Ant's manual living in <i>path/to/my/svn/checkout/of/Ant/Core/docs/manual</i> and generates a <i>toc.xml</i> and a <i>plugin.xml</i> to <i>build</i>. + + + +</body> +</html> Propchange: ant/sandbox/antlibs/manual4eclipse/docs/m4e.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/docs/toc.html URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/docs/toc.html?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/docs/toc.html (original) +++ ant/sandbox/antlibs/manual4eclipse/docs/toc.html Wed Mar 26 12:36:59 2008 @@ -1,22 +1,38 @@ -<html> - -<head> -<meta http-equiv="Content-Language" content="en-us"> -<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>Antlib Manual4Eclipse</title> -<base target="mainFrame"> -</head> - -<body> - -<a href="cover.html">Overview</a><br> - -<h2>Tasks</h2> - - -<a href="m4e.html">m4e</a><br> -<a href="buildPlugin.html">buildPlugin</a><br> - - -</body> -</html> +<!-- + 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. +--> +<html> + +<head> +<meta http-equiv="Content-Language" content="en-us"> +<link rel="stylesheet" type="text/css" href="stylesheets/style.css"> +<title>Antlib Manual4Eclipse</title> +<base target="mainFrame"> +</head> + +<body> + +<a href="cover.html">Overview</a><br> + +<h2>Tasks</h2> + + +<a href="m4e.html">m4e</a><br> +<a href="buildPlugin.html">buildPlugin</a><br> + + +</body> +</html> Propchange: ant/sandbox/antlibs/manual4eclipse/docs/toc.html ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/libraries.properties URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/libraries.properties?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/libraries.properties (original) +++ ant/sandbox/antlibs/manual4eclipse/libraries.properties Wed Mar 26 12:36:59 2008 @@ -1 +1,15 @@ +# 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. artifact.version=1.0-alpha-SNAPSHOT Modified: ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml (original) +++ ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml Wed Mar 26 12:36:59 2008 @@ -1,67 +1,67 @@ -<?xml version="1.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. ---> -<antlib xmlns:current="ant:current"> - <taskdef name="m4e" classname="org.apache.ant.manual4eclipse.Manual4EclipseTask"/> - <macrodef name="buildPlugin"> - <attribute name="manualDir"/> - <attribute name="buildDir"/> - <attribute name="pluginDir" default="@{buildDir}/manual4eclipse"/> - <attribute name="pluginPackage" default="org.apache.ant.manual"/> - <attribute name="antVersion"/> - <sequential> - <tstamp> - <format property="timestamp" pattern="yyyyMMdd"/> - </tstamp> - - <mkdir dir="@{pluginDir}"/> - - <!-- Generate Eclipse PlugIn files --> - <current:m4e dir="@{pluginDir}" manualDir="@{manualDir}"/> - - <!-- Have to modify the cover.html because it refers to an image outside the manual dir. --> - <copy todir="@{pluginDir}" file="@{manualDir}/../images/ant_logo_large.gif"/> - <copy todir="@{pluginDir}" file="@{manualDir}/cover.html"> - <filterchain> - <replaceregex pattern="..\/images\/ant_logo_large.gif" replace="ant_logo_large.gif"/> - </filterchain> - </copy> - - <!-- Jar the stuff --> - <jar destfile="@{buildDir}/@[EMAIL PROTECTED]" duplicate="preserve"> - <fileset dir="@{pluginDir}"/> - <fileset dir="@{manualDir}"/> - <manifest> - <!-- Who is building this jar? --> - <attribute name="Built-By" value="${user.name}"/> - <!-- Information about the program itself --> - <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> - <attribute name="Implementation-Title" value="Ant Manual"/> - <attribute name="Implementation-Version" value="@{antVersion}"/> - <!-- Eclipse-PlugIn Information --> - <attribute name="Bundle-Name" value="Ant Manual"/> - <attribute name="Bundle-Vendor" value="ant.apache.org"/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <attribute name="Bundle-Localization" value="plugin"/> - <attribute name="Bundle-SymbolicName" value="@{pluginPackage}; singleton:=true"/> - <attribute name="Bundle-Version" value="@{antVersion}.v${timestamp}"/> - <attribute name="Eclipse-LazyStart" value="true"/> - </manifest> - </jar> - </sequential> - </macrodef> -</antlib> +<?xml version="1.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. +--> +<antlib xmlns:current="ant:current"> + <taskdef name="m4e" classname="org.apache.ant.manual4eclipse.Manual4EclipseTask"/> + <macrodef name="buildPlugin"> + <attribute name="manualDir"/> + <attribute name="buildDir"/> + <attribute name="pluginDir" default="@{buildDir}/manual4eclipse"/> + <attribute name="pluginPackage" default="org.apache.ant.manual"/> + <attribute name="antVersion"/> + <sequential> + <tstamp> + <format property="timestamp" pattern="yyyyMMdd"/> + </tstamp> + + <mkdir dir="@{pluginDir}"/> + + <!-- Generate Eclipse PlugIn files --> + <current:m4e dir="@{pluginDir}" manualDir="@{manualDir}"/> + + <!-- Have to modify the cover.html because it refers to an image outside the manual dir. --> + <copy todir="@{pluginDir}" file="@{manualDir}/../images/ant_logo_large.gif"/> + <copy todir="@{pluginDir}" file="@{manualDir}/cover.html"> + <filterchain> + <replaceregex pattern="..\/images\/ant_logo_large.gif" replace="ant_logo_large.gif"/> + </filterchain> + </copy> + + <!-- Jar the stuff --> + <jar destfile="@{buildDir}/@[EMAIL PROTECTED]" duplicate="preserve"> + <fileset dir="@{pluginDir}"/> + <fileset dir="@{manualDir}"/> + <manifest> + <!-- Who is building this jar? --> + <attribute name="Built-By" value="${user.name}"/> + <!-- Information about the program itself --> + <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> + <attribute name="Implementation-Title" value="Ant Manual"/> + <attribute name="Implementation-Version" value="@{antVersion}"/> + <!-- Eclipse-PlugIn Information --> + <attribute name="Bundle-Name" value="Ant Manual"/> + <attribute name="Bundle-Vendor" value="ant.apache.org"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Localization" value="plugin"/> + <attribute name="Bundle-SymbolicName" value="@{pluginPackage}; singleton:=true"/> + <attribute name="Bundle-Version" value="@{antVersion}.v${timestamp}"/> + <attribute name="Eclipse-LazyStart" value="true"/> + </manifest> + </jar> + </sequential> + </macrodef> +</antlib> Propchange: ant/sandbox/antlibs/manual4eclipse/src/main/org/apache/ant/manual4eclipse/antlib.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ant/sandbox/antlibs/manual4eclipse/src/manual170.patch URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/src/manual170.patch?rev=641508&r1=641507&r2=641508&view=diff ============================================================================== --- ant/sandbox/antlibs/manual4eclipse/src/manual170.patch (original) +++ ant/sandbox/antlibs/manual4eclipse/src/manual170.patch Wed Mar 26 12:36:59 2008 @@ -1,8 +1,8 @@ -Index: manual/anttaskslist.html -=================================================================== ---- manual/anttaskslist.html (revision 513173) -+++ manual/anttaskslist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/anttaskslist.html +=================================================================== +--- manual/anttaskslist.html (revision 513173) ++++ manual/anttaskslist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -16,7 +16,7 @@ </head> <body> -@@ -29,11 +29,14 @@ +@@ -29,11 +29,14 @@ <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> <h3>Ant Tasks</h3> @@ -36,11 +36,11 @@ + </body> </html> -Index: manual/developlist.html -=================================================================== ---- manual/developlist.html (revision 513173) -+++ manual/developlist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/developlist.html +=================================================================== +--- manual/developlist.html (revision 513173) ++++ manual/developlist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -54,7 +54,7 @@ </head> <body> -@@ -29,18 +29,19 @@ +@@ -29,18 +29,19 @@ <h3>Developing with Ant</h3> @@ -86,11 +86,11 @@ + </body> </html> -Index: manual/conceptstypeslist.html -=================================================================== ---- manual/conceptstypeslist.html (revision 513173) -+++ manual/conceptstypeslist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/conceptstypeslist.html +=================================================================== +--- manual/conceptstypeslist.html (revision 513173) ++++ manual/conceptstypeslist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -104,7 +104,7 @@ </head> <body> -@@ -28,51 +28,51 @@ +@@ -28,51 +28,51 @@ <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> <h3>Concepts</h3> @@ -192,11 +192,11 @@ </body> </html> -Index: manual/optionaltasklist.html -=================================================================== ---- manual/optionaltasklist.html (revision 513173) -+++ manual/optionaltasklist.html (revision 513174) -@@ -17,75 +17,75 @@ +Index: manual/optionaltasklist.html +=================================================================== +--- manual/optionaltasklist.html (revision 513173) ++++ manual/optionaltasklist.html (revision 513174) +@@ -17,75 +17,75 @@ <html> <head> @@ -332,11 +332,11 @@ </body> </html> -Index: manual/runninglist.html -=================================================================== ---- manual/runninglist.html (revision 513173) -+++ manual/runninglist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/runninglist.html +=================================================================== +--- manual/runninglist.html (revision 513173) ++++ manual/runninglist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -350,7 +350,7 @@ </head> <body> -@@ -28,15 +28,17 @@ +@@ -28,15 +28,17 @@ <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> <h3>Running Ant</h3> @@ -377,11 +377,11 @@ </body> </html> -Index: manual/usinglist.html -=================================================================== ---- manual/usinglist.html (revision 513173) -+++ manual/usinglist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/usinglist.html +=================================================================== +--- manual/usinglist.html (revision 513173) ++++ manual/usinglist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -395,7 +395,7 @@ </head> <body> -@@ -28,19 +28,20 @@ +@@ -28,19 +28,20 @@ <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> <h3>Using Ant</h3> @@ -429,11 +429,11 @@ </body> </html> -Index: manual/toc.html -=================================================================== ---- manual/toc.html (revision 513173) -+++ manual/toc.html (revision 513174) -@@ -17,30 +17,30 @@ +Index: manual/toc.html +=================================================================== +--- manual/toc.html (revision 513173) ++++ manual/toc.html (revision 513174) +@@ -17,30 +17,30 @@ <html> <head> @@ -482,11 +482,11 @@ </body> </html> -Index: manual/tutorials.html -=================================================================== ---- manual/tutorials.html (revision 513173) -+++ manual/tutorials.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/tutorials.html +=================================================================== +--- manual/tutorials.html (revision 513173) ++++ manual/tutorials.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -500,7 +500,7 @@ </head> <body> -@@ -29,13 +29,13 @@ +@@ -29,13 +29,13 @@ <h3>Tutorials</h3> @@ -517,11 +517,11 @@ How to get and set properties and how to use nested filesets and paths while writing tasks. Finally it explains how to contribute tasks to Ant.</p> -Index: manual/ide.html -=================================================================== ---- manual/ide.html (revision 513173) -+++ manual/ide.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/ide.html +=================================================================== +--- manual/ide.html (revision 513173) ++++ manual/ide.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -535,11 +535,11 @@ </head> <body> -Index: manual/installlist.html -=================================================================== ---- manual/installlist.html (revision 513173) -+++ manual/installlist.html (revision 513174) -@@ -17,10 +17,10 @@ +Index: manual/installlist.html +=================================================================== +--- manual/installlist.html (revision 513173) ++++ manual/installlist.html (revision 513174) +@@ -17,10 +17,10 @@ <html> <head> @@ -553,7 +553,7 @@ </head> <body> -@@ -28,15 +28,15 @@ +@@ -28,15 +28,15 @@ <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2> <h3>Installing Ant</h3> @@ -577,11 +577,11 @@ </p> </body> </html> -Index: manual/coretasklist.html -=================================================================== ---- manual/coretasklist.html (revision 513173) -+++ manual/coretasklist.html (revision 513174) -@@ -17,111 +17,113 @@ +Index: manual/coretasklist.html +=================================================================== +--- manual/coretasklist.html (revision 513173) ++++ manual/coretasklist.html (revision 513174) +@@ -17,111 +17,113 @@ <html> <head> Propchange: ant/sandbox/antlibs/manual4eclipse/src/manual170.patch ------------------------------------------------------------------------------ svn:eol-style = native