Author: bodewig
Date: Thu Oct 11 01:39:39 2007
New Revision: 583738

URL: http://svn.apache.org/viewvc?rev=583738&view=rev
Log:
merge Ivy announcement from trunk

Modified:
    ant/core/branches/ANT_17_BRANCH/docs/antnews.html
    ant/core/branches/ANT_17_BRANCH/docs/index.html
    ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html   
(contents, props changed)
    ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html   
(contents, props changed)
    ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/sshexec.html
    ant/core/branches/ANT_17_BRANCH/docs/manual/api/index.html
    ant/core/branches/ANT_17_BRANCH/xdocs/antnews.xml
    ant/core/branches/ANT_17_BRANCH/xdocs/index.xml

Modified: ant/core/branches/ANT_17_BRANCH/docs/antnews.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/antnews.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/antnews.html (original)
+++ ant/core/branches/ANT_17_BRANCH/docs/antnews.html Thu Oct 11 01:39:39 2007
@@ -179,6 +179,18 @@
   <div class="content">
     <h1 class="title">News</h1>
             <h3 class="section">
+      <a name="Apache Ivy is an Ant Sub-Project Now!"></a>
+      Apache Ivy is an Ant Sub-Project Now!
+    </h3>
+                        <h3>October 11, 2007 - Apache Ivy is an Ant 
Sub-Project Now!</h3>
+                                <p>Apache Ivy, "A Java based tool for 
tracking, resolving and
+    managing project dependencies.", just finished <a 
href="http://incubator.apache.org/";>Incubation</a> and has joined
+    the Ant project.  More information will be available from the Ant
+    site soon.</p>
+                                <p>Until we've finished the migration, you can 
learn more about
+    Ivy from its <a href="http://incubator.apache.org/ivy/";>Incubator
+    website</a>.</p>
+                        <h3 class="section">
       <a name="AntUnit 1.0"></a>
       AntUnit 1.0
     </h3>

Modified: ant/core/branches/ANT_17_BRANCH/docs/index.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/index.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/index.html (original)
+++ ant/core/branches/ANT_17_BRANCH/docs/index.html Thu Oct 11 01:39:39 2007
@@ -175,6 +175,18 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
+      <a name="Apache Ivy is an Ant Sub-Project Now!"></a>
+      Apache Ivy is an Ant Sub-Project Now!
+    </h3>
+                        <h3>October 11, 2007 - Apache Ivy is an Ant 
Sub-Project Now!</h3>
+                                <p>Apache Ivy, "A Java based tool for 
tracking, resolving and
+    managing project dependencies.", just finished <a 
href="http://incubator.apache.org/";>Incubation</a> and has joined
+    the Ant project.  More information will be available from the Ant
+    site soon.</p>
+                                <p>Until we've finished the migration, you can 
learn more about
+    Ivy from its <a href="http://incubator.apache.org/ivy/";>Incubator
+    website</a>.</p>
+                        <h3 class="section">
       <a name="Ant 1.7.0"></a>
       Ant 1.7.0
     </h3>

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html 
(original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html Thu 
Oct 11 01:39:39 2007
@@ -1,95 +1,95 @@
-<!--
-   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>Antversion Task</title>
-</head>
-
-<body>
-
-<h2><a name="antversion">Antversion</a></h2>
-<h3>Description</h3>
-<p>
-Stores the Ant version (when used as task) or checks for a specific Ant 
version 
-(when used as condition).
-<b>Since Ant 1.7.0</b>
-</p>
-
-<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 (Task)</b></td>
-    <td align="center" valign="top"><b>Required (Condition)</b></td>
-  </tr>
-  <tr>
-    <td valign="top">atleast</td>
-    <td valign="top">The version that this at least.
-      The format is major.minor.point.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" rowspan="2" align="center">One of these.</td>
-  </tr>
-  <tr>
-    <td valign="top">exactly</td>
-    <td valign="top">The version that this ant is exactly.
-      The format is <tt>major.minor.point</tt>.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
-    <td valign="top" align="center">No (ignored)</td>
-  </tr>
-</table>
-
-
-<h3>Examples</h3>
-
-<blockquote><pre>
-&lt;antversion property=&quot;antversion&quot;/&gt;
-</pre></blockquote>
-<p>Stores the current Ant version in the property <i>antversion</i>.</p>
-
-<blockquote><pre>
-&lt;antversion property=&quot;antversion&quot; atleast=&quot;1.6&quot;/&gt;
-</pre></blockquote>
-<p>Stores the Ant version in the property <i>antversion</i> if the current Ant 
version is 1.6.0
-or higher. Otherwise the property remains unset.</p>
-
-<blockquote><pre>
-&lt;antversion property=&quot;ant-is-exact-7&quot; 
exactly=&quot;1.7.0&quot;/&gt;
-</pre></blockquote>
-<p>Sets the property <i>ant-is-exact-7</i> if Ant 1.7.0 is running. Neither 
1.6.5 nor 1.7.0
-would match.</p>
-
-<blockquote><pre>
-&lt;condition property=&quot;Ant17isOnline&quot;&gt;
-  &lt;and&gt;
-    &lt;antversion exactly=&quot;1.7.0&quot;/&gt;
-    &lt;http url=&quot;http://ant.apache.org&quot;/&gt;
-  &lt;/and&gt;
-&lt;/condition&gt;
-</pre></blockquote>
-<p>Sets <i>Ant17isOnline</i> if Ant 1.7.0 is running and can get a 
non-error-response from
-the Ant homepage.</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>Antversion Task</title>
+</head>
+
+<body>
+
+<h2><a name="antversion">Antversion</a></h2>
+<h3>Description</h3>
+<p>
+Stores the Ant version (when used as task) or checks for a specific Ant 
version 
+(when used as condition).
+<b>Since Ant 1.7.0</b>
+</p>
+
+<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 (Task)</b></td>
+    <td align="center" valign="top"><b>Required (Condition)</b></td>
+  </tr>
+  <tr>
+    <td valign="top">atleast</td>
+    <td valign="top">The version that this at least.
+      The format is major.minor.point.</td>
+    <td valign="top" align="center">No</td>
+    <td valign="top" rowspan="2" align="center">One of these.</td>
+  </tr>
+  <tr>
+    <td valign="top">exactly</td>
+    <td valign="top">The version that this ant is exactly.
+      The format is <tt>major.minor.point</tt>.</td>
+    <td valign="top" align="center">No</td>
+  </tr>
+  <tr>
+    <td valign="top">property</td>
+    <td valign="top">The name of the property to set.</td>
+    <td valign="top" align="center">Yes</td>
+    <td valign="top" align="center">No (ignored)</td>
+  </tr>
+</table>
+
+
+<h3>Examples</h3>
+
+<blockquote><pre>
+&lt;antversion property=&quot;antversion&quot;/&gt;
+</pre></blockquote>
+<p>Stores the current Ant version in the property <i>antversion</i>.</p>
+
+<blockquote><pre>
+&lt;antversion property=&quot;antversion&quot; atleast=&quot;1.6&quot;/&gt;
+</pre></blockquote>
+<p>Stores the Ant version in the property <i>antversion</i> if the current Ant 
version is 1.6.0
+or higher. Otherwise the property remains unset.</p>
+
+<blockquote><pre>
+&lt;antversion property=&quot;ant-is-exact-7&quot; 
exactly=&quot;1.7.0&quot;/&gt;
+</pre></blockquote>
+<p>Sets the property <i>ant-is-exact-7</i> if Ant 1.7.0 is running. Neither 
1.6.5 nor 1.7.0
+would match.</p>
+
+<blockquote><pre>
+&lt;condition property=&quot;Ant17isOnline&quot;&gt;
+  &lt;and&gt;
+    &lt;antversion exactly=&quot;1.7.0&quot;/&gt;
+    &lt;http url=&quot;http://ant.apache.org&quot;/&gt;
+  &lt;/and&gt;
+&lt;/condition&gt;
+</pre></blockquote>
+<p>Sets <i>Ant17isOnline</i> if Ant 1.7.0 is running and can get a 
non-error-response from
+the Ant homepage.</p>
+
+</body>
+</html>

Propchange: 
ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/antversion.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html (original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html Thu Oct 11 
01:39:39 2007
@@ -1,55 +1,55 @@
-<!--
-   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>Retry Task</title>
-</head>
-<body>
-<h2>Retry</h2>
-<h3>Description</h3>
-<p>Retry is a container which executes a single nested task until either: 
there is no failure; or:
-its <em>retrycount</em> has been exceeded. If this happens a BuildException is 
thrown.
-<em>Since Ant 1.7.1</em></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">retrycount</td>
-    <td valign="top">number of times to attempt to execute the nested task</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-</table>
-<p>Any valid Ant task may be embedded within the retry task.</p>
-
-<h3>Example</h3>
-<pre>
-&lt;retry retrycount="3"&gt;
-  &lt;get src="http://www.unreliable-server.com/unreliable.tar.gz"; 
-       dest="/home/retry/unreliable.tar.gz" /&gt;
-&lt;/retry&gt;
-</pre>
-<p>This example shows how to use <code>&lt;retry&gt;</code> to wrap a task 
which must interact with an unreliable network resource.</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>Retry Task</title>
+</head>
+<body>
+<h2>Retry</h2>
+<h3>Description</h3>
+<p>Retry is a container which executes a single nested task until either: 
there is no failure; or:
+its <em>retrycount</em> has been exceeded. If this happens a BuildException is 
thrown.
+<em>Since Ant 1.7.1</em></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">retrycount</td>
+    <td valign="top">number of times to attempt to execute the nested task</td>
+    <td valign="top" align="center">Yes</td>
+  </tr>
+</table>
+<p>Any valid Ant task may be embedded within the retry task.</p>
+
+<h3>Example</h3>
+<pre>
+&lt;retry retrycount="3"&gt;
+  &lt;get src="http://www.unreliable-server.com/unreliable.tar.gz"; 
+       dest="/home/retry/unreliable.tar.gz" /&gt;
+&lt;/retry&gt;
+</pre>
+<p>This example shows how to use <code>&lt;retry&gt;</code> to wrap a task 
which must interact with an unreliable network resource.</p>
+</body>
+</html>

Propchange: ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/retry.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/sshexec.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/sshexec.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/sshexec.html 
(original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/sshexec.html Thu 
Oct 11 01:39:39 2007
@@ -188,4 +188,4 @@
 </pre>
 </p>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/api/index.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/api/index.html?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/api/index.html (original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/api/index.html Thu Oct 11 
01:39:39 2007
@@ -28,4 +28,4 @@
 are included with all our distributions.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: ant/core/branches/ANT_17_BRANCH/xdocs/antnews.xml
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/xdocs/antnews.xml?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/xdocs/antnews.xml (original)
+++ ant/core/branches/ANT_17_BRANCH/xdocs/antnews.xml Thu Oct 11 01:39:39 2007
@@ -26,6 +26,20 @@
   </properties>
 
 <body>
+  <section name="Apache Ivy is an Ant Sub-Project Now!">
+    <h3>October 11, 2007 - Apache Ivy is an Ant Sub-Project Now!</h3>
+
+    <p>Apache Ivy, "A Java based tool for tracking, resolving and
+    managing project dependencies.", just finished <a
+    href="http://incubator.apache.org/";>Incubation</a> and has joined
+    the Ant project.  More information will be available from the Ant
+    site soon.</p>
+
+    <p>Until we've finished the migration, you can learn more about
+    Ivy from its <a href="http://incubator.apache.org/ivy/";>Incubator
+    website</a>.</p>
+  </section>
+
   <section name="AntUnit 1.0">
     <h3>January 8, 2007 - Apache AntUnit 1.0 Available</h3>
     <p>Apache AntUnit 1.0 is now available for <a

Modified: ant/core/branches/ANT_17_BRANCH/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/xdocs/index.xml?rev=583738&r1=583737&r2=583738&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/xdocs/index.xml (original)
+++ ant/core/branches/ANT_17_BRANCH/xdocs/index.xml Thu Oct 11 01:39:39 2007
@@ -24,6 +24,20 @@
   </properties>
 
 <body>
+  <section name="Apache Ivy is an Ant Sub-Project Now!">
+    <h3>October 11, 2007 - Apache Ivy is an Ant Sub-Project Now!</h3>
+
+    <p>Apache Ivy, "A Java based tool for tracking, resolving and
+    managing project dependencies.", just finished <a
+    href="http://incubator.apache.org/";>Incubation</a> and has joined
+    the Ant project.  More information will be available from the Ant
+    site soon.</p>
+
+    <p>Until we've finished the migration, you can learn more about
+    Ivy from its <a href="http://incubator.apache.org/ivy/";>Incubator
+    website</a>.</p>
+  </section>
+
    <section name="Ant 1.7.0">
     <h3>December 19, 2006 - Ant 1.7.0 Available</h3>
     <p>Apache Ant 1.7.0 is now available for <a



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to