Return-Path: 
 <notifications-return-5026-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@locus.apache.org
Received: (qmail 46553 invoked from network); 1 Oct 2008 14:47:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Oct 2008 14:47:32 -0000
Received: (qmail 87272 invoked by uid 500); 1 Oct 2008 14:47:30 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 87217 invoked by uid 500); 1 Oct 2008 14:47:30 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 87208 invoked by uid 99); 1 Oct 2008 14:47:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:47:30 -0700
X-ASF-Spam-Status: No, hits=-1998.9 required=10.0
	tests=ALL_TRUSTED,FB_GET_MEDS
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:46:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E5D8B2388882; Wed,  1 Oct 2008 07:46:29 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r700793 - in /ant/ivy/updatesite: ./ branches/ tags/
 trunk/
 trunk/dist/ trunk/dist/features/ trunk/dist/plugins/
 trunk/ivy-feature-template/
Date: Wed, 01 Oct 2008 14:46:29 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081001144629.E5D8B2388882@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hibou
Date: Wed Oct  1 07:46:28 2008
New Revision: 700793

URL: http://svn.apache.org/viewvc?rev=700793&view=rev
Log:
As discussed on ant-dev, move the updatesite so it has its own tags-branches-trunk structure

Added:
    ant/ivy/updatesite/
    ant/ivy/updatesite/branches/
    ant/ivy/updatesite/tags/
    ant/ivy/updatesite/trunk/
    ant/ivy/updatesite/trunk/.project
    ant/ivy/updatesite/trunk/build.xml
      - copied, changed from r699295, ant/ivy/site/build.xml
    ant/ivy/updatesite/trunk/dist/
    ant/ivy/updatesite/trunk/dist/digest.zip
      - copied unchanged from r700024, ant/ivy/site/ivyde/updatesite/digest.zip
    ant/ivy/updatesite/trunk/dist/digest.zip.asc
      - copied unchanged from r700024, ant/ivy/site/ivyde/updatesite/digest.zip.asc
    ant/ivy/updatesite/trunk/dist/digest.zip.sha
      - copied unchanged from r700024, ant/ivy/site/ivyde/updatesite/digest.zip.sha
    ant/ivy/updatesite/trunk/dist/features/
      - copied from r700024, ant/ivy/site/ivyde/updatesite/features/
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.cr1.jar
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivy.feature_2.0.0.cr1.jar
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.cr1.jar.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivy.feature_2.0.0.cr1.jar.asc
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.cr1.jar.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivy.feature_2.0.0.cr1.jar.md5
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.cr1.jar.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivy.feature_2.0.0.cr1.jar.sha
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivyde.feature_2.0.0.alpha1.jar
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivyde.feature_2.0.0.alpha1.jar
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.asc
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.md5
    ant/ivy/updatesite/trunk/dist/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/features/org.apache.ivyde.feature_2.0.0.alpha1.jar.sha
    ant/ivy/updatesite/trunk/dist/plugins/
      - copied from r700024, ant/ivy/site/ivyde/updatesite/plugins/
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.asc
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.md5
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.asc
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.md5
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.pack.gz.sha
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.cr1.jar.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivy_2.0.0.cr1.jar.sha
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.asc
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.md5
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.asc
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.asc
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.md5
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.md5
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.pack.gz.sha
    ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.sha
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/plugins/org.apache.ivyde.eclipse_2.0.0.alpha1.jar.sha
    ant/ivy/updatesite/trunk/dist/site.xml
      - copied unchanged from r700482, ant/ivy/site/ivyde/updatesite/site.xml
    ant/ivy/updatesite/trunk/ivy-feature-template/
      - copied from r700024, ant/ivy/site/ivyde/updatesite/ivy-feature-template/
    ant/ivy/updatesite/trunk/ivy-feature-template/.project
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/ivy-feature-template/.project
    ant/ivy/updatesite/trunk/ivy-feature-template/LICENSE
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/ivy-feature-template/LICENSE
    ant/ivy/updatesite/trunk/ivy-feature-template/NOTICE
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/ivy-feature-template/NOTICE
    ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/ivy-feature-template/feature.properties
    ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml
      - copied unchanged from r700791, ant/ivy/site/ivyde/updatesite/ivy-feature-template/feature.xml
    ant/ivy/updatesite/trunk/signArtifacts.sh
      - copied, changed from r700024, ant/ivy/site/ivyde/updatesite/signArtifacts.sh
    ant/ivy/updatesite/trunk/verifyArtifacts.sh
      - copied, changed from r700024, ant/ivy/site/ivyde/updatesite/verifyArtifacts.sh

Added: ant/ivy/updatesite/trunk/.project
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/.project?rev=700793&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/.project (added)
+++ ant/ivy/updatesite/trunk/.project Wed Oct  1 07:46:28 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ivyde-updatesite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Copied: ant/ivy/updatesite/trunk/build.xml (from r699295, ant/ivy/site/build.xml)
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?p2=ant/ivy/updatesite/trunk/build.xml&p1=ant/ivy/site/build.xml&r1=699295&r2=700793&rev=700793&view=diff
==============================================================================
--- ant/ivy/site/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Wed Oct  1 07:46:28 2008
@@ -16,235 +16,13 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<project default="generate-site"
-        xmlns:xooki="antlib:xooki">
+<project default="optimize">
 
-    <taskdef uri="antlib:xooki" file="${basedir}/xooki/antlib.xml" />
-    <property name="target.dir" value="${basedir}/target" />
     <property name="work.dir" value="${basedir}/work"/>
-    <property name="updatesite.dir" value="${basedir}/ivyde/updatesite"/>
+    <property name="updatesite.dir" value="${basedir}/dist"/>
 
-    <target name="/all" description="--> force whole site generation, disabling incremental mode">
-        <property name="checkUpToDate" value="false" />
-    </target>
-
-    <target name="copy-resources" depends="copy-resources-ivy,copy-resources-ivyde" />
-
-    <target name="copy-resources-ivy">
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}" overwrite="${overwrite}" >
-            <fileset dir="${basedir}">
-                <include name="*.cgi" />
-                <include name="images/**" />
-                <include name="style/**" />
-                <include name="samples/**" />
-                <include name="js/**" />
-                <include name="schemas/**" />
-                <include name="presentations/**" />
-                <include name="history/*/images/**" />
-                <include name="history/*/samples/**" />
-                <include name="test/**" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="copy-resources-ivyde">
-        <property name="checkUpToDate" value="true" />
-        <condition property="overwrite">
-             <isfalse value="${checkUpToDate}"/>
-        </condition>
-        <copy todir="${target.dir}/ivyde" overwrite="${overwrite}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="*.cgi" />
-                <include name="style/**" />
-                <include name="js/**" />
-                <!-- On the main update site, only deploy references to the mirrors -->
-                <include name="updatesite/digest.zip" />
-                <include name="updatesite/site.xml" />
-                <include name="updatesite/eclipse-*" />
-                <include name="images/**" />
-                <include name="history/*/images/**" />
-            </fileset>
-        </copy>
-    </target>
-
-    <macrodef name="generate-printdoc">
-        <attribute name="version" />
-        <sequential>
-            <xooki:print 
-                src="${basedir}/history/@{version}/index.html" 
-                dest="${target.dir}/history/@{version}/book.html" />
-        </sequential>
-    </macrodef>
-
-    <target name="generate-printdoc-trunk" depends="copy-resources"
-            description="--> Generates trunk documentation printer friendly version">
-        <generate-printdoc version="trunk" />
-    </target>
-
-    <target name="generate-printdoc-latest-milestone" depends="copy-resources"
-            description="--> Generates latest-milestone documentation printer friendly version">
-        <generate-printdoc version="latest-milestone" />
-    </target>
-
-    <target name="generate-printdoc" depends="copy-resources"
-            description="--> Generates documentation printer friendly version">
-        <input message="Ivy version to generate doc for?" addproperty="version" />
-        <generate-printdoc version="${version}" />
-    </target>
-
-
-    <target name="generate-site" depends="generate-site-ivy,generate-site-ivyde"
-            description="--> Generates site of Ivy and IvyDE for publication" />
-
-    <target name="generate-site-ivy" depends="init-imported-history-ivy, copy-resources-ivy"
-            description="--> Generates site of Ivy for publication">
-        <!-- by default we use incremental mode, which checks if files require generation -->
-        <property name="checkUpToDate" value="true" />
-
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}">
-                <include name="**/*.html"/>
-                <exclude name="**/template.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="presentations/**"/>
-                <exclude name="samples/**"/>
-                <exclude name="js/**"/>
-                <exclude name="**/xooki/**"/>
-                <exclude name="target/**"/>
-                <exclude name="ivyde/**"/>
-            </fileset>
-        </xooki:generate>
-    </target>
-
-    <target name="generate-site-ivyde" depends="init-imported-history-ivyde, copy-resources-ivyde"
-            description="--> Generates site of IvyDE for publication">
-        <!-- by default we use incremental mode, which checks if files require generation -->
-        <property name="checkUpToDate" value="true" />
-
-        <!-- xooki:generate requires sun java 6 jdk (with jrunscript) in path and Apache Ant 1.7 -->
-        <xooki:generate destDir="${target.dir}/ivyde" checkUpToDate="${checkUpToDate}">
-            <fileset dir="${basedir}/ivyde">
-                <include name="**/*.html"/>
-                <exclude name="**/template.html"/>
-                <exclude name="**/*Template.html"/>
-                <exclude name="**/xooki/**"/>
-                <exclude name="js/**"/>
-                <exclude name="updatesite/**"/>
-            </fileset>
-        </xooki:generate>
-    </target>
-
-
-    <!-- 
-    INITIALIZE IMPORTED DOCUMENTATION OF HISTORY VERSIONS
-    Imported documentations need to have a special configuration javascript
-    in their home, so that they know they are imported and properly
-    display the whole TOC, and not only their own one.
-    The targets below are used to initialize those imported versions
-    with ad hoc configuration file. It should only be called once 
-    per imported documentation version.
-    -->
-    <macrodef name="init-imported-version">
-        <attribute name="version" />
-        <attribute name="basepath" default="." />
-        <sequential>
-            <echo file="@{basepath}/history/@{version}/config.extra.js" 
-                  message="xooki.c.setImportLevel(2);" />
-        </sequential>
-    </macrodef>
-
-    <target name="init-imported-history" depends="init-imported-history-ivy,init-imported-history-ivyde"
-            description="--> initialize all imported documentation history for Ivy and IvyDE" />
-
-    <target name="init-imported-history-ivy"
-            description="--> initialize all imported documentation history for Ivy">
-        <init-imported-version version="trunk" />
-        <init-imported-version version="latest-milestone" />
-        <init-imported-version version="2.0.0-rc1" />
-        <init-imported-version version="2.0.0-beta2" />
-        <init-imported-version version="2.0.0-beta1" />
-        <init-imported-version version="2.0.0-alpha2" />
-    </target>
-
-    <target name="init-imported-history-ivyde"
-            description="--> initialize all imported documentation history for IvyDE">
-        <init-imported-version basepath="ivyde" version="trunk" />
-        <init-imported-version basepath="ivyde" version="latest-milestone" />
-        <init-imported-version basepath="ivyde" version="2.0.0.alpha1" />
-        <init-imported-version basepath="ivyde" version="1.2.0" />
-    </target>
-
-    <target name="tagsdoc" 
-            description="--> Generates tagsdoc.properties file which can be used in IvyDE for code completion documentation">
-        <scriptdef name="generate-tagsdoc" language="javascript">
-            <element name="fileset" type="fileset"/>
-            <attribute name="destFile"/>
-            <![CDATA[
-                importPackage(java.io);
-                importPackage(javax.xml.xpath);
-                importPackage(org.xml.sax);
-                importPackage(javax.xml.parsers);
-
-                fs = elements.get("fileset").get(0);
-                srcDir = elements.get("fileset").get(0).getDir(project);
-
-                // Get the files (array) of that fileset
-                ds = fs.getDirectoryScanner(project);
-                srcFiles = ds.getIncludedFiles();
-
-
-                // iterate over that array
-                print('processing '+srcFiles.length+' source files...');
-                var xpath = XPathFactory.newInstance().newXPath();
-
-                out = new FileWriter(self.getProject().resolveFile(attributes.get("destfile")));
-                for (i=0; i<srcFiles.length; i++) {
-                    try {
-                        // get the values via Java API
-                        var file = new File(fs.getDir(project), srcFiles[i]);
-                        print('processing '+ file + '...');
-                    
-                        // skip DOCTYPE in source
-                        r = new BufferedReader(new FileReader(file));
-                        r.readLine();
-                        inputSource = new InputSource(r);
-
-                        builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                        document = builder.parse(inputSource);
-
-                        var expression = "//span[@class='tagdoc']";
-                        var t = xpath.evaluate(expression, document, XPathConstants.NODE);
-                        if (t == null) {
-                            print('\tno tagdoc span found: ignored');
-                            continue;
-                        }
-                        var id = t.getAttributes().getNamedItem("id").getTextContent();
-
-                        out.write('##### ' + id + '\n');
-                        out.write(id + ' = ' + t.getTextContent() + '\n');
-
-                        expression = "//table[@class='ivy-attributes'][1]/tbody/tr/td[1]";
-                        var atts = xpath.evaluate(expression, document, XPathConstants.NODESET);
-                        for (j=0; j<atts.getLength(); j++) {
-                            out.write(id + '.@' + atts.item(j).getTextContent() + ' = ' 
-                                + xpath.evaluate("../td[2]", atts.item(j), XPathConstants.NODE).getTextContent() + '\n');
-                        }
-                    } catch (e) {
-                        print('\terror: ' + e);
-                    }
-                }
-                out.close();
-            ]]>
-        </scriptdef>
-        <property name="ivydoc" value="${basedir}/target/history/trunk/" />
-        <generate-tagsdoc destFile="tagsdoc.properties">
-            <fileset dir="${ivydoc}" includes="settings/**/*.html,resolver/**/*.html" />
-        </generate-tagsdoc>
+    <target name="clean">
+        <delete dir="$ {work.dir}" />
     </target>
 
     <!-- 
@@ -295,18 +73,18 @@
     	Target to generate the Ivy feature and put it in the updatesite
         ===================================================================================================================    
       -->
-    <target name="updatesite:generate-ivy-feature" description="Generate the Eclipse feature for Ivy">
+    <target name="generate-ivy-feature" description="Generate the Eclipse feature for Ivy">
         <fail message="You have to specify the version of the ivy" unless="ivy.version" />
         <!-- first generate a feature descriptor with the proper version -->
         <delete file="${work.dir}/feature.xml" />
-        <copy file="${updatesite.dir}/ivy-feature-template/feature.xml" todir="${work.dir}">
+        <copy file="ivy-feature-template/feature.xml" todir="${work.dir}">
             <filterset>
                 <filter token="ivy.version" value="${ivy.version}"/>
             </filterset>
         </copy>
         <!-- package the feature -->
         <jar destfile="${updatesite.dir}/features/org.apache.ivy.feature_${ivy.version}.jar">
-            <fileset dir="${updatesite.dir}/ivy-feature-template">
+            <fileset dir="ivy-feature-template">
                 <include name="feature.properties" />
                 <include name="LICENCE"/>
                 <include name="NOTICE"/>
@@ -322,9 +100,9 @@
     	Targets to manage the updatesite
         ===================================================================================================================    
       -->
-    <target name="updatesite:optimize" depends="updatesite:pack-jars,updatesite:build-digest" description="Optimize the update site" />
+    <target name="optimize" depends="pack-jars,build-digest" description="Optimize the update site" />
 
-    <target name="updatesite:pack-jars" depends="eclipse-classpath">
+    <target name="pack-jars" depends="eclipse-classpath">
         <!-- prepare the working area, so copy plugin jars -->
         <delete dir="${work.dir}/updatesite/" />
         <mkdir dir="${work.dir}/updatesite/" />
@@ -349,7 +127,7 @@
         </copy>
     </target>
 
-    <target name="updatesite:build-digest" depends="eclipse-classpath">
+    <target name="build-digest" depends="eclipse-classpath">
         <java classpath="${eclipse.classpath}" classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
             <arg value="-consolelog" />
             <arg line="-application org.eclipse.update.core.siteOptimizer"/>
@@ -358,7 +136,7 @@
         </java>
     </target>
 
-    <target name="updatesite:checksum" description="Compute the checksum for every artifact to distribute">
+    <target name="checksum" description="Compute the checksum for every artifact to distribute">
         <checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
             <fileset dir="${updatesite.dir}">
                 <include name="plugins/org.apache.ivy*.jar" />
@@ -377,7 +155,7 @@
         </checksum>
     </target>
 
-    <target name="updatesite:verify-checksum" description="Verify the checksums of the artifacts to publish">
+    <target name="verify-checksum" description="Verify the checksums of the artifacts to publish">
         <checksum algorithm="MD5" fileext=".md5" format="MD5SUM" verifyproperty="checksum.md5.ok" >
             <fileset dir="${updatesite.dir}">
                 <include name="plugins/org.apache.ivy*.jar" />

Copied: ant/ivy/updatesite/trunk/signArtifacts.sh (from r700024, ant/ivy/site/ivyde/updatesite/signArtifacts.sh)
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/signArtifacts.sh?p2=ant/ivy/updatesite/trunk/signArtifacts.sh&p1=ant/ivy/site/ivyde/updatesite/signArtifacts.sh&r1=700024&r2=700793&rev=700793&view=diff
==============================================================================
--- ant/ivy/site/ivyde/updatesite/signArtifacts.sh (original)
+++ ant/ivy/updatesite/trunk/signArtifacts.sh Wed Oct  1 07:46:28 2008
@@ -19,7 +19,7 @@
 
 read -s -p "Key passphrase: " passphrase
 
-for i in features/org.apache.ivy*.jar; do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
-for i in plugins/org.apache.ivy*.jar;  do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
-for i in plugins/org.apache.ivy*.jar.pack.gz;  do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
-gpg --passphrase "$passphrase" --output digest.zip.asc --detach-sig --armor digest.zip
+for i in dist/features/org.apache.ivy*.jar; do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
+for i in dist/plugins/org.apache.ivy*.jar;  do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
+for i in dist/plugins/org.apache.ivy*.jar.pack.gz;  do gpg --passphrase "$passphrase" --output $i.asc --detach-sig --armor $i; done
+gpg --passphrase "$passphrase" --output dist/digest.zip.asc --detach-sig --armor dist/digest.zip

Copied: ant/ivy/updatesite/trunk/verifyArtifacts.sh (from r700024, ant/ivy/site/ivyde/updatesite/verifyArtifacts.sh)
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/verifyArtifacts.sh?p2=ant/ivy/updatesite/trunk/verifyArtifacts.sh&p1=ant/ivy/site/ivyde/updatesite/verifyArtifacts.sh&r1=700024&r2=700793&rev=700793&view=diff
==============================================================================
--- ant/ivy/site/ivyde/updatesite/verifyArtifacts.sh (original)
+++ ant/ivy/updatesite/trunk/verifyArtifacts.sh Wed Oct  1 07:46:28 2008
@@ -17,7 +17,7 @@
 #   specific language governing permissions and limitations
 #   under the License.
 
-for i in features/org.apache.ivy*.jar; do gpg --verify $i.asc; done
-for i in plugins/org.apache.ivy*.jar;  do gpg --verify $i.asc; done
-for i in plugins/org.apache.ivy*.jar.pack.gz;  do gpg --verify $i.asc; done
-gpg --verify digest.zip.asc
+for i in dist/features/org.apache.ivy*.jar; do gpg --verify $i.asc; done
+for i in dist/plugins/org.apache.ivy*.jar;  do gpg --verify $i.asc; done
+for i in dist/plugins/org.apache.ivy*.jar.pack.gz;  do gpg --verify $i.asc; done
+gpg --verify dist/digest.zip.asc