ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [6/12] - in /ant/core/branches/ANT_SITE: ./ docs/ docs/antlibs/ docs/antlibs/antunit/ docs/antlibs/compress/ docs/antlibs/dotnet/ docs/antlibs/props/ docs/antlibs/svn/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs...
Date Mon, 13 Dec 2010 18:34:09 GMT
Modified: ant/core/branches/ANT_SITE/docs/nightlies.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/nightlies.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/nightlies.html (original)
+++ ant/core/branches/ANT_SITE/docs/nightlies.html Mon Dec 13 18:34:00 2010
@@ -97,7 +97,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -137,6 +137,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -153,6 +156,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -163,9 +169,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -201,7 +204,7 @@
       Nightly Builds
     </h3>
                         <p>We don't provide binary nightly builds at the moment, but if you
-want to build Ant from sources, you can use a <a href="http://svn.apache.org/snapshots/ant/">Subversion snapshot</a>.</p>
+want to build Apache Ant from sources, you can use a <a href="http://svn.apache.org/snapshots/ant/">Subversion snapshot</a>.</p>
                         <h3 class="section">
       <a name="Continuous Builds"></a>
       Continuous Builds
@@ -211,9 +214,9 @@ Note that these are no official builds a
 But if you have problems with <i>testing</i> the latest (successful) build, you are welcome to post
 that on the <a href="mail.html#Developer%20List:%20dev@ant.apache.org">developer mailinglist</a>.
 You can directly access the builds of Ant and Ivy on these CI installations:</p>
-                                <p>The Apache Software Foundation <a href="http://hudson.zones.apache.org/hudson/">hosts</a> an
-installation of the <a href="http://hudson.dev.java.net/">Hudson</a> CI-system which Ant + Ivy
-<a href="http://hudson.zones.apache.org/hudson/view/Ant/">use</a>.</p>
+                                <p>The Apache Software Foundation <a href="http://hudson.apache.org/hudson/">hosts</a> an
+installation of the <a href="http://hudson-ci.org/">Hudson</a> CI-system which Ant + Ivy
+<a href="https://hudson.apache.org/hudson/view/A-F/view/Ant/">use</a>.</p>
                                     <table class="ContinuousBuild">
     <tr>
       <th>Title</th>
@@ -224,30 +227,79 @@ installation of the <a href="http://huds
       <th>last success</th>
     </tr>
             <tr><td colspan="6" class="title"><b>Apache Ant</b></td></tr>
+                        <tr>
+      <td class="title">Ant Trunk on JDK 1.4</td>
+      <td class="description">current development on the lowest defined JDK</td>
+      <td class="command">build.sh</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_JDK_1.4/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_JDK_1.4/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+                        <tr>
+      <td class="title">Ant Trunk Tests on JDK 1.4</td>
+      <td class="description">current development on the lowest defined JDK</td>
+      <td class="command">build.sh allclean test</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_JDK_1.4_Test/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_JDK_1.4_Test/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+                        <tr>
+      <td class="title">Checks Ant POMs by building Ant from the POMs.</td>
+      <td class="description">Checks the POMs by building Ant by Maven</td>
+      <td class="command">maven src/etc/poms/pom.xml clean package</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_BuildFromPOMs/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_BuildFromPOMs/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+                        <tr>
+      <td class="title">Ant Nightly</td>
+      <td class="description">Metric checks of Ant Trunk (Findbugs, RAT, Checkstyle)</td>
+      <td class="command">ant allclean distribution | ant -f check.xml dumphtml findbugs rat</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_Nightly/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant_Nightly/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+                        <tr>
+      <td class="title">Ant JDK-Matrix</td>
+      <td class="description">Checks Ant Trunk against several JDKs (1.4, 1.5, 1.6)</td>
+      <td class="command">ant test</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant-Build-Matrix/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ant-Build-Matrix/lastSuccessfulBuild/">last success</a></td>
+    </tr>
                 <tr><td colspan="6" class="title"><b>Apache Ivy</b></td></tr>
                         <tr>
       <td class="title">Ivy Core Trunk</td>
       <td class="description">current development</td>
-      <td class="command"></td>
+      <td class="command">ant clean jar</td>
+              <td class="when">continuously</td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ivy/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ivy/lastSuccessfulBuild/">last success</a></td>
+    </tr>
+                        <tr>
+      <td class="title">Ivy Core Trunk Checks</td>
+      <td class="description">Metric checks of Ivy Trunk (Findbugs, RAT, Checkstyle)</td>
+      <td class="command">ant findbugs checkstyle-internal | ant -f build-release.xml rat</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//Ivy/lastBuild/">last build</a></td>
-      <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//Ivy/lastSuccessfulBuild/">last success</a></td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ivy-check/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/Ivy-check/lastSuccessfulBuild/">last success</a></td>
     </tr>
+                <tr><td colspan="6" class="title"><b>Apache IvyDE</b></td></tr>
                         <tr>
       <td class="title">IvyDE Trunk</td>
       <td class="description">current development</td>
-      <td class="command"></td>
+      <td class="command">ant clean hudson-prepare | ant dist checkstyle rat</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//IvyDE/lastBuild/">last build</a></td>
-      <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//IvyDE/lastSuccessfulBuild/">last success</a></td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/IvyDE/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/IvyDE/lastSuccessfulBuild/">last success</a></td>
     </tr>
                         <tr>
       <td class="title">Eclipse Updatesite</td>
       <td class="description">Update your Eclipse installation with the latest Ivy/IvyDE</td>
-      <td class="command"></td>
+      <td class="command">ant hudson-prepare | ant hudson-build</td>
               <td class="when">continuously</td>
-            <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//IvyDE-updatesite/lastBuild/">last build</a></td>
-      <td class="link"><a href="http://hudson.zones.apache.org/hudson/view/Ant//IvyDE-updatesite/lastSuccessfulBuild/">last success</a></td>
+            <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/IvyDE-updatesite/lastBuild/">last build</a></td>
+      <td class="link"><a href="https://hudson.apache.org/hudson/view/A-F/view/Ant//job/IvyDE-updatesite/lastSuccessfulBuild/">last success</a></td>
     </tr>
                 </table>
                                 <p>JetBrains is offering Ant the service of a Continuous Build on their TeamCity system.</p>
@@ -356,6 +408,7 @@ installation of the <a href="http://huds
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/problems.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/problems.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/problems.html (original)
+++ ant/core/branches/ANT_SITE/docs/problems.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -204,7 +207,7 @@
     </h3>
                         <p>
            This page details some steps you can take to try and resolve
-           any problems you may be having with Ant. If you find you can't
+           any problems you may be having with Apache Ant. If you find you can't
            resolve the problem, then this page will help you collect some of
            the relevant information to provide in a bug report. This information
            will help the Ant developers understand and resolve the problem.

Modified: ant/core/branches/ANT_SITE/docs/projects.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/projects.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/projects.html (original)
+++ ant/core/branches/ANT_SITE/docs/projects.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -202,7 +205,7 @@
       <a name="Related Projects"></a>
       Related Projects
     </h3>
-                        <p>Nothing listed here is directly supported by the Ant
+                        <p>Nothing listed here is directly supported by the Apache Ant
       developers, if you encounter any problems with them, please use
       the contact information.</p>
                                       <h4 class="subsection">

Modified: ant/core/branches/ANT_SITE/docs/projects/index.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/projects/index.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/projects/index.html (original)
+++ ant/core/branches/ANT_SITE/docs/projects/index.html Mon Dec 13 18:34:00 2010
@@ -100,7 +100,7 @@
                               </li>
                       </ul>
         </li>
-              <li class="menuheader">Ant Libraries
+              <li class="menuheader">Apache Ant Libraries
           <ul>
                             <li>
                                     <a href="../antlibs/index.html">Introduction</a>
@@ -122,7 +122,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Ivy
+              <li class="menuheader">Apache Ivy
           <ul>
                             <li>
                                     <a href="../projects/ivy.html">Introduction</a>
@@ -138,7 +138,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">IvyDE
+              <li class="menuheader">Apache IvyDE
           <ul>
                             <li>
                                     <a href="../projects/ivyde.html">Introduction</a>
@@ -167,11 +167,11 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Welcome to the Ant Projects Area"></a>
-      Welcome to the Ant Projects Area
+      <a name="Welcome to the Apache Ant&amp;#x2122; Projects Area"></a>
+      Welcome to the Apache Ant&#x2122; Projects Area
     </h3>
-                        <h3>This is where the Ant sub-projects live!</h3>
-                                <p>Now, that Ant has become an Apache Top-Level Project it is time to make space on this
+                        <h3>This is where the Apache Ant sub-projects live!</h3>
+                                <p>Now, that Apache Ant has become an Apache Top-Level Project it is time to make space on this
     Web-Page for Ant sub-projects.</p>
                                 <p>To make sure you do not miss anything: Stay tuned and visit this page from time to time :)!
     </p>
@@ -180,6 +180,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/projects/ivy.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/projects/ivy.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/projects/ivy.html (original)
+++ ant/core/branches/ANT_SITE/docs/projects/ivy.html Mon Dec 13 18:34:00 2010
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - The Ivy Subproject</title>
+        <title>Apache Ant - The Apache Ivy Subproject</title>
         <link type="text/css" href="../page.css" rel="stylesheet">
         </head>
 
@@ -98,7 +98,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Ant Libraries
+              <li class="menuheader">Apache Ant Libraries
           <ul>
                             <li>
                                     <a href="../antlibs/index.html">Introduction</a>
@@ -120,7 +120,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Ivy
+              <li class="menuheader">Apache Ivy
           <ul>
                             <li>
                                     <a href="../projects/ivy.html">Introduction</a>
@@ -136,7 +136,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">IvyDE
+              <li class="menuheader">Apache IvyDE
           <ul>
                             <li>
                                     <a href="../projects/ivyde.html">Introduction</a>
@@ -163,13 +163,13 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">The Ivy Subproject</h1>
+    <h1 class="title">The Apache Ivy Subproject</h1>
             <h3 class="section">
-      <a name="The Ivy Subproject"></a>
-      The Ivy Subproject
+      <a name="The Apache Ivy&amp;#x2122; Subproject"></a>
+      The Apache Ivy&#x2122; Subproject
     </h3>
                         <h3>Apache Ivy</h3>
-                                <p>Ivy is a simple yet powerful dependency manager featuring continuous integration,
+                                <p>Apache Ivy is a simple yet powerful dependency manager featuring continuous integration,
       dependencies of dependencies management, multiple repositories including ibiblio and
       high performance (use of a local cache).</p>
                 
@@ -177,6 +177,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/projects/ivyde.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/projects/ivyde.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/projects/ivyde.html (original)
+++ ant/core/branches/ANT_SITE/docs/projects/ivyde.html Mon Dec 13 18:34:00 2010
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - The IvyDE Subproject</title>
+        <title>Apache Ant - The Apache IvyDE Subproject</title>
         <link type="text/css" href="../page.css" rel="stylesheet">
         </head>
 
@@ -98,7 +98,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Ant Libraries
+              <li class="menuheader">Apache Ant Libraries
           <ul>
                             <li>
                                     <a href="../antlibs/index.html">Introduction</a>
@@ -120,7 +120,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">Ivy
+              <li class="menuheader">Apache Ivy
           <ul>
                             <li>
                                     <a href="../projects/ivy.html">Introduction</a>
@@ -136,7 +136,7 @@
                                 </li>
                       </ul>
         </li>
-              <li class="menuheader">IvyDE
+              <li class="menuheader">Apache IvyDE
           <ul>
                             <li>
                                     <a href="../projects/ivyde.html">Introduction</a>
@@ -163,13 +163,13 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">The IvyDE Subproject</h1>
+    <h1 class="title">The Apache IvyDE Subproject</h1>
             <h3 class="section">
-      <a name="The IvyDE Subproject"></a>
-      The IvyDE Subproject
+      <a name="The Apache IvyDE&amp;#x2122; Subproject"></a>
+      The Apache IvyDE&#x2122; Subproject
     </h3>
                         <h3>Apache IvyDE</h3>
-                                <ul>IvyDE is the Eclipse plugin which intergrate Ivy into your java development enviromnent. It includes:
+                                <ul>Apache IvyDE is the Eclipse plugin which intergrates Apache Ivy into your java development enviromnent. It includes:
         <li>an Ivy xml files editor: creation wizard, html preview and completion for Ivy xml tag, attributes but also attributes' values.</li>
         <li>an Ivy settings files editor: completion for xml tag, attributes but also attributes' values.</li>
         <li>a classpath container: automatic downloads, access "resolve" task from your IDE, and resolve in Eclipse's workspace</li>
@@ -180,6 +180,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/resources.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/resources.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/resources.html (original)
+++ ant/core/branches/ANT_SITE/docs/resources.html Mon Dec 13 18:34:00 2010
@@ -23,9 +23,7 @@
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
         <title>Apache Ant - Resources</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
-          <meta name="author" content="Stefan Bodewig">
-  <meta name="email" content="bodewig@apache.org">
-      </head>
+        </head>
 
     <body>
       <p class="navpath">
@@ -99,7 +97,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +137,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +156,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +169,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -203,10 +204,10 @@
       FAQs
     </h3>
                               <h4 class="subsection">
-        <a name="At Ant's website"></a>
-        At Ant's website
+        <a name="At Apache Ant&amp;#x2122;'s website"></a>
+        At Apache Ant&#x2122;'s website
       </h4>
-                        <p>Starting with the release of Ant 1.4 the Ant's FAQ is
+                        <p>Starting with the release of Apache Ant 1.4 the Ant's FAQ is
         bundled with the distribution, the most recent version can
         always be found at the website.</p>
                                       <table class="externals" cellspacing="1" cellpadding="4">
@@ -253,7 +254,7 @@
         FAQ about Borland Application Server tasks
       </h4>
                         <p>Benoit Moussaud, the original author of the Borland
-        Application Server specific <a href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
+        Application Server specific <a href="manual/Tasks/ejb.html#ejbtasks">EJB tasks</a> has put
         together a FAQ for this specific subtask.</p>
                                       <table class="externals" cellspacing="1" cellpadding="4">
               <tr>
@@ -1454,6 +1455,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/srcdownload.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/srcdownload.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/srcdownload.html (original)
+++ ant/core/branches/ANT_SITE/docs/srcdownload.html Mon Dec 13 18:34:00 2010
@@ -97,7 +97,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -137,6 +137,9 @@
                             <li>
                               <span class="sel">Source Distributions</span>
                               </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -153,6 +156,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -163,9 +169,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -197,8 +200,14 @@
   <div class="content">
     <h1 class="title">Source Distributions</h1>
             <h3 class="section">
-      <a name="Downloading Ant"></a>
-      Downloading Ant
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
+    </h3>
+                        <p>Apache Ant is a Java library and command-line tool that help
+  building software.</p>
+                        <h3 class="section">
+      <a name="Downloading Apache Ant"></a>
+      Downloading Apache Ant
     </h3>
                         <p>Use the links below to download a source distribution of Ant from
 one of our mirrors.  It is good practice to
@@ -239,14 +248,14 @@ Other mirrors: <select name="Preferred">
 <input type="submit" value="Change" />
 </form>
                         <h3 class="section">
-      <a name="Current Release of Ant"></a>
-      Current Release of Ant
+      <a name="Current Release of Apache Ant"></a>
+      Current Release of Apache Ant
     </h3>
-                        <p>Currently, Apache Ant 1.8.0 is the best available version, see the
+                        <p>Currently, Apache Ant 1.8.1 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.8.0 was released on 8-Feb-2010 and
+<div class="content">Ant 1.8.1 was released on 7-May-2010 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -257,37 +266,38 @@ may not be available on all mirrors for 
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.zip">apache-ant-1.8.0-src.zip</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.zip">apache-ant-1.8.1-src.zip</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.gz">apache-ant-1.8.0-src.tar.gz</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.tar.gz">apache-ant-1.8.1-src.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.bz2">apache-ant-1.8.0-src.tar.bz2</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.tar.bz2">apache-ant-1.8.1-src.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
       Old Ant Releases
     </h3>
-                        <p>Older releases of Ant can be found <a href="http://archive.apache.org/dist/ant/source/">here</a>.  Those
-releases are only provided as <code>zip</code> archives that can be
-extracted by <code>jar xf </code><em>archive.zip</em> - we highly
+                        <p>Older releases of Ant can be found <a href="http://archive.apache.org/dist/ant/source/">here</a>.  We highly
 recommend to not use those releases but upgrade to Ant's <a href="[location]#Current Release of Ant">latest</a> release.</p>
                         <h3 class="section">
       <a name="Verify Releases"></a>
       Verify Releases
     </h3>
                         <p>It is essential that you verify the integrity of the downloaded
-files using the PGP signature or the SHA1 or MD5 checksums.  The
+files using the PGP signature or the SHA1, SHA512 or MD5 checksums.  The
 checksums are not as strong indicators as the PGP signature.</p>
                                 <p>The PGP signatures can be verified using PGP or GPG.  First
 download the <a href="http://www.apache.org/dist/ant/KEYS">KEYS</a>
@@ -297,21 +307,21 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.8.0-src.tar.gz.asc<br />
+% pgpv apache-ant-1.8.1-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.8.0-src.tar.gz.asc<br />
+% pgp apache-ant-1.8.1-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.8.0-src.tar.gz.asc
+% gpg --verify apache-ant-1.8.1-src.tar.gz.asc
 </code></p>
                                 <p>Alternatively, you can verify the checksums on the files.  Unix
-programs called <code>md5</code>/<code>sha1</code> or
-<code>md5sum</code>/<code>sha1sum</code> are included in many unix
+programs called <code>md5</code>/<code>sha1</code>/<code>sha512</code> or
+<code>md5sum</code>/<code>sha1sum</code>/<code>sha512sum</code> are included in many unix
 distributions.  <code>*sum</code> is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
 Textutils</a>.  Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/">here</a>.  <a href="http://www.slavasoft.com/fsum/">fsum</a> supports MD5 and
 SHA1.</p>
@@ -321,6 +331,7 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/svn.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/svn.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/svn.html (original)
+++ ant/core/branches/ANT_SITE/docs/svn.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management

Modified: ant/core/branches/ANT_SITE/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/fetch.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/fetch.xml (original)
+++ ant/core/branches/ANT_SITE/fetch.xml Mon Dec 13 18:34:00 2010
@@ -60,6 +60,10 @@
   <!-- load in our properties table -->
   <property file="${lib.dir}/libraries.properties"/>
 
+  <!-- Temporary cache for working files -->
+  <property name="temp.dir" location="${user.home}/.ant/tempcache" />
+  <property name="keep.temp.dir" value="true" />
+
   <import file="get-m2.xml" />
 
   <target name="pick-dest">
@@ -99,9 +103,10 @@ Set -Ddest=LOCATION on the command line
     <macrodef name="f2">
       <attribute name="project" />
       <attribute name="archive" default="@{project}"/>
+      <attribute name="repository" default="${m2.repo}"/>
       <sequential>
         <fail>
-        Unknown archive @{archive} -no property @{archive}.version defined.
+        Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
           <condition>
             <not>
             <isset property="@{archive}.version"/>
@@ -112,6 +117,7 @@ Set -Ddest=LOCATION on the command line
           <dependency groupID="@{project}"
             artifactID="@{archive}"
             version="${@{archive}.version}"/>
+          <remoteRepository url="@{repository}" />
         </artifact:dependencies>
         <!-- now we are left with the problem of getting the files
              into our directory -->
@@ -123,11 +129,71 @@ Set -Ddest=LOCATION on the command line
     </macrodef>
   </target>
 
+  <target name="nonm2-macros" depends="pick-dest">
+    <macrodef name="get-ftp-file">
+      <attribute name="host" />
+      <attribute name="port" default="21"/>
+      <attribute name="remotedir" />
+      <attribute name="filename" />
+      <attribute name="localdir" default="${dest.dir}" />
+      <attribute name="user" default="anonymous"/>
+      <attribute name="pw" default="anonymous"/>
+      <sequential>
+        <ftp server="@{host}" port="@{port}" userid="@{user}" password="@{pw}" passive="true"
+            remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
+            skipFailedTransfers="true">
+          <fileset dir="@{localdir}">
+            <include name="@{filename}" />
+          </fileset>
+        </ftp>
+      </sequential>
+    </macrodef>
+
+  </target>
+
 
 
   <!-- any init stuff -->
   <target name="init" depends="macros" />
 
+  <target name="init-no-m2" depends="nonm2-macros" />
+
+  <target name="init-cache">
+    <available property="temp.cache.already.exists" file="${temp.dir}" type="dir" />
+    <condition property="user.wants.temp.cache">
+      <and>
+        <isset property="keep.temp.dir" />
+        <not>
+          <or>
+            <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false" />
+          </or>
+        </not>
+      </and>
+    </condition>
+    <condition property="delete.temp.cache">
+      <and>
+        <not>
+          <isset property="temp.cache.already.exists" />
+        </not>
+        <not>
+          <isset property="user.wants.temp.cache" />
+        </not>
+      </and>
+    </condition>
+  </target>
+
+  <target name="-setup-temp-cache" depends="init-cache" unless="temp.cache.already.exists"
+          description="Setup temporary cache for downloaded files">
+    <mkdir dir="${temp.dir}" />
+  </target>
+
+  <target name="-cleanup-temp-cache" depends="init-cache" if="delete.temp.cache"
+          description="Gets rid of the temporary cache directory">
+    <delete dir="${temp.dir}" />
+  </target>
+
 
   <target name="diag" depends="init">
     <echoproperties />
@@ -153,16 +219,12 @@ Set -Ddest=LOCATION on the command line
     <f2 project="xml-resolver" />
   </target>
 
-  <!--
-   This is not used as
-   we like to get the more recent artifacts than are in the repo at the time of writing (2006-12-21)
-   -->
-
   <target name="networking"
     description="load networking libraries (commons-net; jsch)"
     depends="init">
     <f2 project="commons-net" />
     <f2 project="com.jcraft" archive="jsch"/>
+    <available property="have.commons.net" classname="org.apache.commons.net.ftp.FTPClientConfig"/>
   </target>
 
   <target name="regexp"
@@ -242,8 +304,40 @@ Set -Ddest=LOCATION on the command line
     <f2 project="javax.servlet" archive="servlet-api"/>
   </target>
 
+  <target name="jai" depends="init"
+          description="load java advanced imaging">
+    <f2 project="javax.media" archive="jai-core" repository="http://repository.jboss.org/maven2"/>
+    <f2 project="com.sun.media" archive="jai-codec" repository="http://repository.jboss.org/maven2"/>
+  </target>
+
+  <target name="netrexx" depends="init-no-m2,-setup-temp-cache,networking,-fetch-netrexx,-fetch-netrexx-no-commons-net,-cleanup-temp-cache"
+          description="load NetRexx compiler" />
+
+  <target name="-fetch-netrexx" depends="-setup-temp-cache"
+          description="FTPs NetRexx compiler from IBM site" if="have.commons.net">
+    <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
+            filename="NetRexx.zip" localdir="${temp.dir}" />
+    <copy todir="${dest.dir}" flatten="true">
+      <zipfileset src="${temp.dir}/NetRexx.zip">
+        <include name="NetRexx\lib\NetRexxC.jar" />
+        <include name="NetRexx\browse\license.txt" />
+      </zipfileset>
+    </copy>
+  </target>
+
+  <target name="-fetch-netrexx-no-commons-net" depends="-setup-temp-cache"
+          description="FTPs NetRexx compiler from IBM site" unless="have.commons.net">
+    <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip" dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
+    <copy todir="${dest.dir}" flatten="true">
+      <zipfileset src="${temp.dir}/NetRexx.zip">
+        <include name="NetRexx\lib\NetRexxC.jar" />
+        <include name="NetRexx\browse\license.txt" />
+      </zipfileset>
+    </copy>
+  </target>
+
   <target name="all"
     description="load all the libraries (except jython)"
-    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc" />
+    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx" />
 
 </project>

Modified: ant/core/branches/ANT_SITE/lib/libraries.properties
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/lib/libraries.properties?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/lib/libraries.properties (original)
+++ ant/core/branches/ANT_SITE/lib/libraries.properties Mon Dec 13 18:34:00 2010
@@ -26,6 +26,8 @@ m2.antlib.url=${m2.url}/org/apache/maven
 #this is the sha1 checksum of the artifact
 m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
 
+# Repository to use by default for fetching dependencies.
+m2.repo=http://repo1.maven.org/maven2/
 
 #versions of different libraries. Please keep in alphabetical order, except
 #when a specific dependency forces them to be out-of-order
@@ -37,11 +39,13 @@ bsh-core.version=${bsh.version}
 commons-net.version=1.4.1
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
+jai-core.version=1.1.3
+jai-codec.version=1.1.3
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
 jdepend.version=2.9.1
 jruby.version=0.9.8
-junit.version=3.8.2
+junit.version=4.8.1
 jsch.version=0.1.42
 jython.version=2.1
 #log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo

Propchange: ant/core/branches/ANT_SITE/lib/optional/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 13 18:34:00 2010
@@ -1,23 +1,38 @@
-jdepend*.jar
-s*.jar
 NetRexxC.jar
-activation.jar
-antlr*.jar
+activation-*.jar
+antlr-*.jar
+asm-*.jar
+asm-commons-*.jar
+asm-tree-*.jar
 bcel*.jar
-bsf.jar
-bsh*.jar
-commons-logging*.jar
-commons-net*.jar
-jai_codec.jar
-jai_core.jar
+bsf-*.jar
+bsh-*.jar
+commons-logging-*.jar
+commons-net-*.jar
+jai-codec-*.jar
+jai-core-*.jar
 jakarta-oro-*.jar
 jakarta-regexp-*.jar
-js.jar
-jsch*.jar
+jasper-compiler-*.jar
+jasper-runtime-*.jar
+jdepend-*.jar
+jruby-*.jar
+js-*.jar
+jsch-*.jar
+jython-*.jar
+license.txt
 log4j-*.jar
-mail.jar
+mail-*.jar
+maven-artifact-ant-*-dep.jar
 mlibwrapper_jai.jar
+oro-*.jar
+regexp-*.jar
 resolver.jar
+serializer-*.jar
+servlet-api-*.jar
 starteam-sdk.jar
 weblogic*.jar
-xalan*.jar
+which-*.jar
+xalan-*.jar
+xml-apis-*.jar
+xml-resolver-*.jar

Modified: ant/core/branches/ANT_SITE/lib/optional/README
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/lib/optional/README?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/lib/optional/README (original)
+++ ant/core/branches/ANT_SITE/lib/optional/README Mon Dec 13 18:34:00 2010
@@ -1,3 +1,4 @@
-The file junit-3.8.2.jar is version 3.8.2 of JUnit, see the file LICENSE.junit.html
-for the terms of distribution.  For more information about JUnit or
-the latest release, see <http://www.junit.org/>.
+The file junit-3.8.2.jar is version 3.8.2 of JUnit, whereas junit-4.8.1.jar is
+version 4.8.1 with the junit.** classes removed (except for the 3.x -> 4.x
+adapter); see the file LICENSE.junit.html for the terms of distribution. For
+more information about JUnit or the latest release, see <http://www.junit.org/>.

Modified: ant/core/branches/ANT_SITE/release.sh
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/release.sh?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/release.sh (original)
+++ ant/core/branches/ANT_SITE/release.sh Mon Dec 13 18:34:00 2010
@@ -31,6 +31,9 @@ export PATH=$JAVA_HOME/bin:$PATH
 echo ANT_HOME=$ANT_HOME
 echo JAVA_HOME=$JAVA_HOME
 which java
-echo running second build under JDK 1.5 including tests
-./build.sh distribution run-tests
+echo running second build under JDK 1.5
+./build.sh dist-lite 
+echo running third build to run the tests and do the distribution
+dist/bin/ant -nouserlib -lib lib/optional  run-tests distribution
+
 

Modified: ant/core/branches/ANT_SITE/src/etc/junit-frames-xalan1.xsl
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/junit-frames-xalan1.xsl?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/junit-frames-xalan1.xsl (original)
+++ ant/core/branches/ANT_SITE/src/etc/junit-frames-xalan1.xsl Mon Dec 13 18:34:00 2010
@@ -4,7 +4,7 @@
     xmlns:redirect="org.apache.xalan.lib.Redirect"
     xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
     extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
 <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -97,14 +97,28 @@
             <xsl:apply-templates select="." mode="class.details"/>
         </redirect:write>
         <xsl:if test="string-length(./system-out)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.txt">
-                <xsl:value-of select="./system-out" />
-            </redirect:write>
+          <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.html">
+            <html>
+              <head>
+                <title>Standard Output from <xsl:value-of select="@name"/></title>
+              </head>
+              <body>
+                <pre><xsl:value-of select="./system-out"/></pre>
+              </body>
+            </html>
+          </redirect:write>
         </xsl:if>
         <xsl:if test="string-length(./system-err)!=0">
-            <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.txt">
-                <xsl:value-of select="./system-err" />
-            </redirect:write>
+          <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.html">
+            <html>
+              <head>
+                <title>Standard Error from <xsl:value-of select="@name"/></title>
+              </head>
+              <body>
+                <pre><xsl:value-of select="./system-err"/></pre>
+              </body>
+            </html>
+          </redirect:write>
         </xsl:if>
     </xsl:for-each>
 </xsl:template>
@@ -264,7 +278,7 @@ h6 {
             <xsl:if test="string-length(./system-out)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.html</xsl:attribute>
                         System.out &#187;
                     </a>
                 </div>
@@ -272,7 +286,7 @@ h6 {
             <xsl:if test="string-length(./system-err)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.html</xsl:attribute>
                         System.err &#187;
                     </a>
                 </div>

Modified: ant/core/branches/ANT_SITE/src/etc/junit-frames.xsl
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/junit-frames.xsl?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/junit-frames.xsl (original)
+++ ant/core/branches/ANT_SITE/src/etc/junit-frames.xsl Mon Dec 13 18:34:00 2010
@@ -4,7 +4,7 @@
     xmlns:redirect="http://xml.apache.org/xalan/redirect"
     xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
     extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
 <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -117,13 +117,27 @@
       <xsl:apply-templates select="." mode="class.details"/>
     </redirect:write>
     <xsl:if test="string-length(./system-out)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
+        <html>
+          <head>
+            <title>Standard Output from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-out"/></pre>
+          </body>
+        </html>
       </redirect:write>
     </xsl:if>
     <xsl:if test="string-length(./system-err)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
+        <html>
+          <head>
+            <title>Standard Error from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-err"/></pre>
+          </body>
+        </html>
       </redirect:write>
     </xsl:if>
     <xsl:if test="@failures != 0">
@@ -384,7 +398,7 @@ h6 {
             <xsl:if test="string-length(./system-out)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
                         System.out &#187;
                     </a>
                 </div>
@@ -392,7 +406,7 @@ h6 {
             <xsl:if test="string-length(./system-err)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
                         System.err &#187;
                     </a>
                 </div>

Modified: ant/core/branches/ANT_SITE/src/etc/junit-noframes.xsl
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/junit-noframes.xsl?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/junit-noframes.xsl (original)
+++ ant/core/branches/ANT_SITE/src/etc/junit-noframes.xsl Mon Dec 13 18:34:00 2010
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
         xmlns:lxslt="http://xml.apache.org/xslt"
         xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"
+<xsl:output method="html" indent="yes" encoding="UTF-8"
   doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
 <xsl:decimal-format decimal-separator="." grouping-separator="," />
 <!--

Modified: ant/core/branches/ANT_SITE/src/etc/poms/README.txt
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/README.txt?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/README.txt (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/README.txt Mon Dec 13 18:34:00 2010
@@ -8,10 +8,9 @@ Libs not available in the maven reposito
 groupId          artifactId       version   comment
 com.bea          weblogic         8.1.3.0   download it
 com.bea          weblogicclasses  5.1       a newer version can do.
-jai              jai-core         1.1.2_01  download jai from sun
-jai              jai-codec        1.1.2.1   download jai from sun
-javax.media      jmf              2.1.1e    dowmload jmf from sun
-com.ibm.netrexx  netrexx          2.0.5     I used the file NetRexxC.jar from the netrexx distribution
+jai              jai-core         1.1.2_01  fetch.xml
+jai              jai-codec        1.1.2.1   fetch.xml
+com.ibm.netrexx  netrexx          2.0.5     fetch.xml
 com.starteam     starteam-sdk     5.2       the original file is called starteam-sdk.jar
 stylebook        stylebook        1.0-b2    the original file is called stylebook-1.0-b2.jar
 

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-antlr/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-antlr/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-antlr/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-antlr/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,19 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + ANTLR</name>
   <description>antlr specific task.
     The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bcel/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bcel/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bcel/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bcel/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,17 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -56,8 +57,8 @@
           <source>1.4</source>
           <target>1.4</target>
           <includes>
-            <include>org/apache/tools/ant/tfilters/util/JavaClassHelper*</include>
-            <include>org/apache/tools/ant/tutil/depend/bcel/*</include>
+            <include>org/apache/tools/ant/filters/util/JavaClassHelper*</include>
+            <include>org/apache/tools/ant/util/depend/bcel/*</include>
           </includes>
         </configuration>
       </plugin>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bsf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bsf/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bsf/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bsf/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,17 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-log4j/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-log4j/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-log4j/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-log4j/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,17 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-oro/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-oro/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-oro/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-oro/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,17 +27,18 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -59,6 +60,9 @@
             <include>org/apache/tools/ant/util/regexp/JakartaOro*</include>
             <include>org/apache/tools/ant/taskdefs/optional/perforce/*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/perforce/*</include>
+          </testIncludes>
         </configuration>
       </plugin>
     </plugins>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-regexp/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-regexp/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-regexp/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-regexp/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,17 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-resolver/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-resolver/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-resolver/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-resolver/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,17 +26,18 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Apache Resolver</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,24 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Xalan 2</name>
   <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-nodeps</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-logging/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-logging/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-logging/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-logging/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,18 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Commons Logging</name>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-net/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-net/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-net/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-net/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,18 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + Commons Net</name>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -60,6 +61,9 @@ xsi:schemaLocation="http://maven.apache.
             <include>org/apache/tools/ant/taskdefs/optional/net/RExec*</include>
             <include>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/net/FTP*</include>
+          </testIncludes>
         </configuration>
       </plugin>
     </plugins>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-jai/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-jai/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-jai/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-jai/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,36 +27,40 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JAI</name>
   <description>image task and corresponding types.
-  jai (Java Advanced Imaging) is not available in public Maven repositories, therefore the dependencies are included with a scope provided
-    the download URL is http://java.sun.com/products/java-media/jai/
   </description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.media</groupId>
       <artifactId>jai-core</artifactId>
-      <version>1.1.2_01</version>
-      <scope>provided</scope>
+      <version>1.1.3</version>
     </dependency>
     <dependency>
-      <groupId>jai</groupId>
+      <groupId>com.sun.media</groupId>
       <artifactId>jai-codec</artifactId>
-      <version>1.1.2.1</version>
-      <scope>provided</scope>
+      <version>1.1.3</version>
     </dependency>
   </dependencies>
+  <repositories>
+      <repository>
+          <id>jboss</id>
+          <name>JBoss</name>
+          <url>http://repository.jboss.org/maven2/</url>
+      </repository>
+  </repositories>
   <build>
     <plugins>
       <plugin>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,12 +26,13 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JavaMail</name>
   <description>implementation of the mail task based on javamail.
     Required to send emails to SMTP servers using user/password combinations
   or to send mail over SSL</description>
@@ -39,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,19 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JDepend</name>
   <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
     jdepend parser available on the maven repository</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-jmf/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-jmf/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-jmf/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-jmf/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,27 +26,22 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JMF</name>
   <description>contains the sound task and a soundplayer listener
     download the dependency from http://java.sun.com/products/java-media/jmf/</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.media</groupId>
-      <artifactId>jmf</artifactId>
-      <version>2.1.1e</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-jsch/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-jsch/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-jsch/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-jsch/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,19 +26,20 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JSch</name>
   <description>contains the sshexec and scp tasks
   jsch 0.1.29 might not be available from maven</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -59,6 +60,9 @@ xsi:schemaLocation="http://maven.apache.
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/ssh/*</include>
           </includes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/ssh/*</include>
+          </testIncludes>
         </configuration>
       </plugin>
     </plugins>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-junit/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-junit/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-junit/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-junit/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,18 +26,19 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + JUnit</name>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -82,6 +83,12 @@ xsi:schemaLocation="http://maven.apache.
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/junit/*</include>
           </includes>
+          <excludes>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter*</exclude>
+          </excludes>
+          <testIncludes>
+            <include>org/apache/tools/ant/taskdefs/optional/junit/</include>
+          </testIncludes>
         </configuration>
       </plugin>
     </plugins>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-launcher/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-launcher/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-launcher/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-launcher/pom.xml Mon Dec 13 18:34:00 2010
@@ -27,12 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant Launcher</name>
   <build>
     <plugins>
       <plugin>

Modified: ant/core/branches/ANT_SITE/src/etc/poms/ant-netrexx/pom.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/etc/poms/ant-netrexx/pom.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/etc/poms/ant-netrexx/pom.xml (original)
+++ ant/core/branches/ANT_SITE/src/etc/poms/ant-netrexx/pom.xml Mon Dec 13 18:34:00 2010
@@ -26,27 +26,31 @@ xsi:schemaLocation="http://maven.apache.
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.2-SNAPSHOT</version>
+  <name>Apache Ant + NetRexx</name>
   <description>NetRexxC task
     dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <!-- Processed too early, before maven-antrun-plugin gets a chance to work:
     <dependency>
       <groupId>com.ibm.netrexx</groupId>
       <artifactId>netrexx</artifactId>
       <version>2.0.5</version>
-      <scope>provided</scope>
+      <scope>system</scope>
+      <systemPath>${basedir}/../../../../lib/optional/NetRexxC.jar</systemPath>
     </dependency>
+    -->
   </dependencies>
   <build>
     <plugins>
@@ -59,8 +63,32 @@ xsi:schemaLocation="http://maven.apache.
           <includes>
             <include>org/apache/tools/ant/taskdefs/optional/NetRexxC*</include>
           </includes>
+          <!-- Need to use this rather than system scope as above: -->
+          <compilerArguments>
+            <extdirs>${basedir}/../../../../lib/optional</extdirs>
+          </compilerArguments>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <configuration>
+              <tasks>
+                <ant dir="${basedir}/../../../.." antfile="fetch.xml" target="netrexx">
+                  <property name="dest" value="optional"/>
+                </ant>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/testcases</testSourceDirectory>



Mime
View raw message