Author: xavier
Date: Fri Dec  7 22:07:20 2007
New Revision: 602328

URL: http://svn.apache.org/viewvc?rev=602328&view=rev
Log:
prepare 2.0.0-beta1 release

Added:
    ant/ivy/site/download.cgi   (with props)
    ant/ivy/site/images/ivy-dl-2.0.0-beta1.png   (with props)
Modified:
    ant/ivy/site/build.xml
    ant/ivy/site/choose-distrib.html
    ant/ivy/site/download.html
    ant/ivy/site/history/   (props changed)
    ant/ivy/site/images/ivy-dl.xcf
    ant/ivy/site/index.html
    ant/ivy/site/toc.json

Modified: ant/ivy/site/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/build.xml?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
--- ant/ivy/site/build.xml (original)
+++ ant/ivy/site/build.xml Fri Dec  7 22:07:20 2007
@@ -26,7 +26,7 @@
                <!-- xooki:generate requires sun java 6 jdk (with jrunscript) 
in path and Apache Ant 1.7 -->
         <copy todir="${target.dir}">
                <fileset dir="${basedir}" 
-                       
includes="images/**,style/**,samples/**,js/**,schemas/**,presentations/**,history/*/images/**,history/*/samples/**"
 />
+                       
includes="*.cgi,images/**,style/**,samples/**,js/**,schemas/**,presentations/**,history/*/images/**,history/*/samples/**"
 />
         </copy>
         <xooki:generate destDir="${target.dir}" checkUpToDate="true">
                        <fileset dir="${basedir}">
@@ -95,6 +95,7 @@
     <target name="init-imported-history"
             description="--> initialize all imported documentation history">
         <init-imported-version version="trunk" />
-        <init-imported-version version="2.0.0-alpha2" />
+       <init-imported-version version="2.0.0-beta1" />
+       <init-imported-version version="2.0.0-alpha2" />
     </target>
 </project>

Modified: ant/ivy/site/choose-distrib.html
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/choose-distrib.html?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
--- ant/ivy/site/choose-distrib.html (original)
+++ ant/ivy/site/choose-distrib.html Fri Dec  7 22:07:20 2007
@@ -25,17 +25,20 @@
 </head>
 <body>
        <textarea id="xooki-source">
-Each distribution of ivy contains samples. The documentation is packaged 
separately due to its size. It corresponds to a snapshot of the online 
documentation at the time of the release. Prefer the site itself if you want to 
have an updated and commented version of the documentation.
+Each distribution of ivy contains examples and documentation. The 
documentation can also be browsed online, we have an history of all versions 
since 2.0.0-alpha2.
+
 With each version of ivy, you can find:
 <h2>binary distribution</h2>
-Containing ivy jars, dependencies and samples.
-This is the recommended version if you just want to use ivy. It requires at 
least a jre 1.4+ to run, and it is recommended to use it from ant (1.5.1+, 
1.6.2+ recommended).
+Containing ivy jars, documentation and examples + a build.xml to download 
dependencies from maven2 repository.
+This is the recommended version to use Ivy, you will get ivy jar and be able 
to make your first use of Ivy to download the dependencies you need. All Ivy 
dependencies are only optional, so you can even use it without downloading any 
dependency. It requires at least a jre 1.4+ to run, and it is recommended to 
use it with Ant (1.5.1+, 1.6.2+ recommended).
+<h2>binary distribution with dependencies</h2>
+Containing ivy jars, dependencies, documentation and examples.
+This version is well suited if you want to easily use Ivy with all its 
optional tasks reying on external dependencies, without having to download them 
later. It requires at least a jre 1.4+ to run, and it is recommended to use it 
with Ant (1.5.1+, 1.6.2+ recommended).
 <h2>sources</h2>
-Ready to be build with ant 1.6.0 or greater and ... ivy 1.4-RC1+. Yes, ivy 
eats its own dog food, and needs a binary version of itself to be build. Note 
that you will also need to have an internet access during build in order to ivy 
to download dependencies from ibiblio.
-This is the recommended version if you want to build ivy yourself and see it 
in action at the same time.
-<i>Note:</i> version 1.6.0 of ant is required here because the build file use 
its namespace feature to import ivy tasks.
-<h2>documentation</h2>
-Full ivy documentation easily browsable offline, packaged as a zip.</textarea>
+Ready to be build with Ant 1.6.0 or greater. You will need to have an internet 
access during the build in order to get Ivy download its dependencies from the 
repository.
+This is the recommended version if you want to build Ivy yourself and see it 
in action at the same time.
+<i>Note:</i> version 1.6.0 of ant is required here because the build file use 
its namespace feature to import Ivy tasks.
+</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
 </html>

Added: ant/ivy/site/download.cgi
URL: http://svn.apache.org/viewvc/ant/ivy/site/download.cgi?rev=602328&view=auto
==============================================================================
--- ant/ivy/site/download.cgi (added)
+++ ant/ivy/site/download.cgi Fri Dec  7 22:07:20 2007
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+#  python includes correctly)
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
\ No newline at end of file

Propchange: ant/ivy/site/download.cgi
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ant/ivy/site/download.html
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/download.html?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
--- ant/ivy/site/download.html (original)
+++ ant/ivy/site/download.html Fri Dec  7 22:07:20 2007
@@ -20,25 +20,61 @@
 <html>
 <head>
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+       <script type="text/javascript">
+       // use download cgi when deployed on http site
+       if (m = 
/(http:.*\/)download.html([^\/]*)/.exec(window.location.toString())) {
+               window.location.href = m[1] + "download.cgi" + m[2];
+       }
+       </script>
        <script type="text/javascript">var xookiConfig = {level: 0};</script>   
        <script type="text/javascript" src="xooki/xooki.js"></script>
 </head>
 <body>
        <textarea id="xooki-source">
-<h2>Download</h2>
-<div style="float:right;margin:10px;"><a 
href="http://people.apache.org/dist/incubator/ivy/2.0.0-alpha2-incubating/";><img
 src="images/ivy-dl-2.0.0-alpha2.png" style="border: none;"/></a></div>
-<em>Ivy has graduated from the incubator recently, and has not yet released a 
version since its graduation. The latest release available is thus still marked 
as an incubating release.</em>
+<div style="float:right;margin:10px;"><a 
href="[preferred]/ant/ivy/2.0.0-beta1/"><img 
src="images/ivy-dl-2.0.0-beta1.png" style="border: none;"/></a></div>
 
-The second release of Ivy within the Apache Incubator, <b>2.0.0-alpha2</b>, is 
available. Check the [[history/2.0.0-alpha2/index release notes]].
+The first release of Apache Ivy as a sub project of Ant, <b>2.0.0-beta1</b>, 
is available. Check the [[history/2.0.0-beta1/release-notes release notes]].
 
-Use the links below to download a distribution of Ivy from our repository. It 
is good practice to <a href="#VerifyReleases">verify the integrity</a> of the 
distribution files, especially if you are using one of our mirror sites. In 
order to do this you must use the signatures from our <a 
href="http://people.apache.org/dist/incubator/ivy/";>main distribution 
directory</a>.
+Use the links below to download a distribution of Ivy from one of our mirrors. 
It is good practice to <a href="[location]#VerifyReleases">verify the 
integrity</a> of the distribution files, especially if you are using one of our 
mirror sites. To do this you must use the signatures from our <a 
href="http://www.apache.org/dist/ant/ivy/";>main distribution directory</a>.
 
 Ivy is distributed as zip and tar.gz archives - the contents are the same. 
Please note that the tar.gz archives contain file names longer than 100 
characters and have been created using GNU tar extensions. Thus they must be 
untarred with a GNU compatible version of tar.
 
-You can download Ivy binary and source distribution here:
-<code>
-http://people.apache.org/dist/incubator/ivy/
-</code>
+If you do not see the file you need in the links below, please see the <a 
href="http://www.apache.org/dist/ant/ivy/";>master distribution directory</a> 
or, preferably, its <a href="[preferred]/ant/ivy/">mirror</a>.
+
+<h2>Select mirror</h2>
+You are currently using <b>[preferred]</b>.  If you encounter a problem with 
this mirror, please select another mirror.  If all mirrors are failing, there 
are <i>backup</i> mirrors (at the end of the mirrors list) that should be 
available.
+
+<form action="[location]" method="get" id="SelectMirror">
+Other mirrors: <select name="Preferred">
+[if-any http]
+  [for http]<option value="[http]">[http]</option>[end]
+[end]
+[if-any ftp]
+  [for ftp]<option value="[ftp]">[ftp]</option>[end]
+[end]
+[if-any backup]
+  [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+[end]
+</select>
+<input type="submit" value="Change" />
+</form>
+
+<h2>Ivy 2.0.0-beta1</h2>
+<em>Ivy 2.0.0-beta1 has been released on 9-Dec-2007 and may not be available 
on all mirrors for a few days.</em>
+
+To get information about the different kind of distributions, see 
[[choose-distrib that page]].
+
+<table border="0" cellpadding="4px">
+<tr><td><b>binary</b></td>
+       <td><a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.zip">apache-ivy-2.0.0-beta1-bin.zip</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.zip.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.zip.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.zip.md5">MD5</a>)
+               <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.tar.gz">apache-ivy-2.0.0-beta1-bin.tar.gz</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.tar.gz.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.tar.gz.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin.tar.gz.md5">MD5</a>)</td></tr>
+<tr><td><b>binary-with-dependencies</b></td>
+       <td><a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.zip">apache-ivy-2.0.0-beta1-bin-with-deps.zip</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.zip.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.zip.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.zip.md5">MD5</a>)
+               <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.tar.gz">apache-ivy-2.0.0-beta1-bin-with-deps.tar.gz</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.tar.gz.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.tar.gz.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-bin-with-deps.tar.gz.md5">MD5</a>)</td></tr>
+<tr><td><b>sources</b></td>
+       <td><a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.zip">apache-ivy-2.0.0-beta1-src.zip</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.zip.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.zip.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.zip.md5">MD5</a>)
+               <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.tar.gz">apache-ivy-2.0.0-beta1-src.tar.gz</a>
 (<a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.tar.gz.asc">PGP</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.tar.gz.sha">SHA1</a>
 <a 
href="[preferred]/ant/ivy/2.0.0-beta1/apache-ivy-2.0.0-beta1-src.tar.gz.md5">MD5</a>)</td></tr>
+</table>
 
 <h2>Building from source</h2>
 What you can get here at the ASF is the latest sources from the Subversion 
repository:
@@ -58,21 +94,21 @@
 <h2><a name="VerifyReleases">Verify Releases</a></h2>
 It is essential that you verify the integrity of the downloaded files using 
the PGP signature or the SHA1 or MD5 checksums.  The checksums are not as 
strong indicators as the PGP signature.
 
-The PGP signatures can be verified using PGP or GPG.  First download the <a 
href="http://people.apache.org/dist/incubator/ivy/KEYS";>KEYS</a> as well as the 
asc signature file for the particular distribution.  Make sure you get these 
files from the <a href="http://people.apache.org/dist/incubator/ivy/";>main 
distribution directory</a>, rather than from a mirror. Then verify the 
signatures using
+The PGP signatures can be verified using PGP or GPG.  First download the <a 
href="http://www.apache.org/dist/ant/KEYS";>KEYS</a> as well as the asc 
signature file for the particular distribution.  Make sure you get these files 
from the <a href="http://www.apache.org/dist/ant/ivy/";>main distribution 
directory</a>, rather than from a mirror. Then verify the signatures using
 
 <code>
 % pgpk -a KEYS
-% pgpv apache-ivy-2.0.0-alpha2-incubating-bin.tar.gz.asc
+% pgpv apache-ivy-2.0.0-beta1-bin.tar.gz.asc
 </code>
 <em>or</em>
 <code>
 % pgp -ka KEYS
-% pgp apache-ivy-2.0.0-alpha2-incubating-bin.tar.gz.asc
+% pgp apache-ivy-2.0.0-beta1-bin.tar.gz.asc
 </code>
 <em>or</em>
 <code>
 % gpg --import KEYS
-% gpg --verify apache-ivy-2.0.0-alpha2-incubating-bin.tar.gz.asc
+% gpg --verify apache-ivy-2.0.0-beta1-bin.tar.gz.asc
 </code>
 
 Alternatively, you can verify the checksums on the files.  Unix programs 
called md5/sha1 or md5sum/sha1sum are included in many unix distributions.  
*sum 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.
@@ -87,16 +123,6 @@
 <li><a 
href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-doc.zip";>documentation</a></li>
 </ul>
 
-To have a quick overview of some of the changes in this version, check the <a 
href="history/1.4.html">1.4.1 release notes</a> page.
-
-You can also download ivy jar and ivy.xml alone directly from the jayasoft 
site (useful especially for easy ant setup) using the following pattern:
-http://www.jayasoft.org/downloads/ivy/[revision]/[artifact]-[revision].[ext]
-
-This is used to auto install Ivy from internet, in the [[doc:tutorial first 
tutorial]]. Take a look at these examples if you want such an auto install 
feature in your own builds.
-The xsd for ivy files of the version is also available online at:
-http://www.jayasoft.org/downloads/ivy/[revision]/ivy.xsd
-
-To have info about the different kind of distributions, see [[choose-distrib 
that page]].
 For previous version information and download, see the [[history history 
page]].
 </textarea>
 <script type="text/javascript">xooki.postProcess();</script>

Propchange: ant/ivy/site/history/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Dec  7 22:07:20 2007
@@ -1,2 +1,3 @@
 trunk https://svn.apache.org/repos/asf/ant/ivy/core/trunk/doc
 2.0.0-alpha2 
https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.0.0-alpha2/doc
+2.0.0-beta1 
https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.0.0-beta1/doc

Added: ant/ivy/site/images/ivy-dl-2.0.0-beta1.png
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/images/ivy-dl-2.0.0-beta1.png?rev=602328&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/site/images/ivy-dl-2.0.0-beta1.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ant/ivy/site/images/ivy-dl.xcf
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/images/ivy-dl.xcf?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/ivy/site/index.html
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/index.html?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
--- ant/ivy/site/index.html (original)
+++ ant/ivy/site/index.html Fri Dec  7 22:07:20 2007
@@ -31,10 +31,11 @@
 <tr><td colspan="4" style="font-size:large; padding: 1cm 0 0.7cm 0;">Ivy is a 
popular dependency manager focusing on flexibility and simplicity.<br/>
 Find out more about its unique <a href="features.html">enterprise 
features</a>, what <a href="testimonials.html">people say about it</a>,<br/>
 and [[doc:index how it can improve your build system!]]</td></tr>
-<tr class="homeitems"><td><a href="download.html"><img 
src="images/ivy-dl-2.0.0-alpha2.png"/></a></td><td>[[doc:index <img 
src="images/ivy-book.png"/>]]</td><td><a href="demo.html"><img 
src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img 
src="images/ivy-forum.png"/></a></td></tr>
+<tr class="homeitems"><td><a href="download.html"><img 
src="images/ivy-dl-2.0.0-beta1.png"/></a></td><td>[[doc:index <img 
src="images/ivy-book.png"/>]]</td><td><a href="demo.html"><img 
src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img 
src="images/ivy-forum.png"/></a></td></tr>
 <tr class="homeitems"><td><a 
href="download.html">download</a></td><td>[[doc:index documentation<br/>& 
tutorials]]</td><td><a href="demo.html">demo</a></td><td><a 
href="mailing-lists.html">share your experience</a></td></tr>
 </table>
 <hr/><a href="">Latest News</a><table border="0" cellpadding="5">
+<tr><td>09/12/2007</td><td>[[history/2.0.0-beta1/index]] version 
available</td></tr>
 <tr><td>10/11/2007</td><td>Ivy has <a href="http://www.mail-archive.com/[EMAIL 
PROTECTED]/msg15445.html">graduated </a> as a subproject of Ant!</td></tr>
 <tr><td>07/20/2007</td><td>[[history/2.0.0-alpha2/index]] version 
available</td></tr>
 <tr><td>05/03/2007</td><td><a href="presentations/apache-con-2007/">slides</a> 
from ApacheCon EU 2007 are available!</td></tr>

Modified: ant/ivy/site/toc.json
URL: 
http://svn.apache.org/viewvc/ant/ivy/site/toc.json?rev=602328&r1=602327&r2=602328&view=diff
==============================================================================
--- ant/ivy/site/toc.json (original)
+++ ant/ivy/site/toc.json Fri Dec  7 22:07:20 2007
@@ -92,6 +92,10 @@
                     "title":"2.0.x",
                     "children": [
                         {
+                          "title":"2.0.0-beta1",
+                          "importRoot":"history/2.0.0-beta1",
+                          "importNode":"index"                        },
+                        {
                           "title":"2.0.0-alpha2",
                           "importRoot":"history/2.0.0-alpha2",
                           "importNode":"index"                        },


Reply via email to