ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1180900 - in /ant/ivy/updatesite/branches/p2repo-only: ./ ivy-ant-feature-template/ ivy-ant-plugin/ ivy-feature-template/
Date Mon, 10 Oct 2011 12:02:24 GMT
Author: hibou
Date: Mon Oct 10 12:02:23 2011
New Revision: 1180900

URL: http://svn.apache.org/viewvc?rev=1180900&view=rev
Log:
create a branch of the updatesite that will be p2 only

Added:
    ant/ivy/updatesite/branches/p2repo-only/   (with props)
    ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml   (with props)
    ant/ivy/updatesite/branches/p2repo-only/LICENSE
    ant/ivy/updatesite/branches/p2repo-only/NOTICE
    ant/ivy/updatesite/branches/p2repo-only/build.properties   (with props)
    ant/ivy/updatesite/branches/p2repo-only/build.xml   (with props)
    ant/ivy/updatesite/branches/p2repo-only/category.xml   (with props)
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-feature-template/
      - copied from r1059842, ant/ivy/updatesite/trunk/ivy-ant-feature-template/
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-plugin/
      - copied from r1154707, ant/ivy/updatesite/trunk/ivy-ant-plugin/
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-plugin/LICENSE
      - copied unchanged from r1002043, ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-plugin/MANIFEST.MF
      - copied unchanged from r1002043, ant/ivy/updatesite/trunk/ivy-ant-plugin/MANIFEST.MF
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-plugin/NOTICE
      - copied unchanged from r1059602, ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE
    ant/ivy/updatesite/branches/p2repo-only/ivy-ant-plugin/antlib2plugin.xsl
      - copied unchanged from r1002043, ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl
    ant/ivy/updatesite/branches/p2repo-only/ivy-feature-template/
      - copied from r1002043, ant/ivy/updatesite/trunk/ivy-feature-template/
    ant/ivy/updatesite/branches/p2repo-only/ivy-feature-template/NOTICE
      - copied unchanged from r1059602, ant/ivy/updatesite/trunk/ivy-feature-template/NOTICE
    ant/ivy/updatesite/branches/p2repo-only/ivy-feature-template/feature.properties
      - copied unchanged from r1059842, ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties
    ant/ivy/updatesite/branches/p2repo-only/ivy-feature-template/feature.xml
      - copied unchanged from r1096448, ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml
    ant/ivy/updatesite/branches/p2repo-only/versions.xml   (with props)

Propchange: ant/ivy/updatesite/branches/p2repo-only/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 10 12:02:23 2011
@@ -0,0 +1,3 @@
+local.build.properties
+work
+dist

Added: ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml (added)
+++ ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml Mon Oct 10 12:02:23 2011
@@ -0,0 +1,18 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->

Propchange: ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/branches/p2repo-only/ASL2-header.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/updatesite/branches/p2repo-only/LICENSE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/LICENSE?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/LICENSE (added)
+++ ant/ivy/updatesite/branches/p2repo-only/LICENSE Mon Oct 10 12:02:23 2011
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: ant/ivy/updatesite/branches/p2repo-only/NOTICE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/NOTICE?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/NOTICE (added)
+++ ant/ivy/updatesite/branches/p2repo-only/NOTICE Mon Oct 10 12:02:23 2011
@@ -0,0 +1,5 @@
+Apache IvyDE updatesite
+Copyright 2007-2011 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Added: ant/ivy/updatesite/branches/p2repo-only/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/build.properties?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/build.properties (added)
+++ ant/ivy/updatesite/branches/p2repo-only/build.properties Mon Oct 10 12:02:23 2011
@@ -0,0 +1,22 @@
+#	 ***************************************************************
+#	 * Licensed to the Apache Software Foundation (ASF) under one
+#	 * or more contributor license agreements.  See the NOTICE file
+#	 * distributed with this work for additional information
+#	 * regarding copyright ownership.  The ASF licenses this file
+#	 * to you under the Apache License, Version 2.0 (the
+#	 * "License"); you may not use this file except in compliance
+#	 * with the License.  You may obtain a copy of the License at
+#	 * 
+#	 *   http://www.apache.org/licenses/LICENSE-2.0
+#	 * 
+#	 * Unless required by applicable law or agreed to in writing,
+#	 * software distributed under the License is distributed on an
+#	 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#	 * KIND, either express or implied.  See the License for the
+#	 * specific language governing permissions and limitations
+#	 * under the License.
+#	 ***************************************************************
+
+# For deeper debugging of the build system, set it to true
+eclipse.consoleLog=false
+

Propchange: ant/ivy/updatesite/branches/p2repo-only/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/branches/p2repo-only/build.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: ant/ivy/updatesite/branches/p2repo-only/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/build.xml?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/build.xml (added)
+++ ant/ivy/updatesite/branches/p2repo-only/build.xml Mon Oct 10 12:02:23 2011
@@ -0,0 +1,286 @@
+<project name="apache-ivyde-updatesite">
+
+    <property file="local.build.properties" />
+    <property file="build.properties" />
+    <property environment="env" />
+
+    <property name="work.dir" value="${basedir}/work" />
+    <property name="dist.dir" value="${basedir}/dist" />
+
+    <target name="clean" description="Clean the folders generated during the build">
+        <delete dir="${work.dir}" />
+        <delete dir="${dist.dir}" />
+    </target>
+
+    <!-- ==================================================================================
+        Targets to intialize an ant run with Eclipse. Will be used to manage the updatesite
+        ===================================================================================
+      -->
+
+    <target name="eclipse-startup-check">
+        <fail message="An Eclipse install is needed to run the build. Set your Eclipse
install dir into the baseLocation property." unless="baseLocation" />
+
+        <condition property="eclipse.startup">
+            <available file="${baseLocation}/startup.jar" />
+        </condition>
+    </target>
+
+    <target name="eclipse-startup-classpath" depends="eclipse-startup-check" if="eclipse.startup">
+        <property name="eclipse.classpath" value="${baseLocation}/startup.jar" />
+    </target>
+
+    <target name="eclipse-launcher-classpath" depends="eclipse-startup-check" unless="eclipse.startup">
+        <!-- store path to newest launcher JAR in path id 'newest.equinox.launcher.path.id'
-->
+        <path id="newest.equinox.launcher.path.id">
+            <first count="1">
+                <sort>
+                    <fileset dir="${baseLocation}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"
/>
+                    <!-- Seems the default order is oldest > newest so we must reverse
it.
+                       The 'reverse' and 'date' comparators are in the internal antlib
+                       org.apache.tools.ant.types.resources.comparators.
+                    -->
+                    <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
+                        <!-- 'date' inherits 'reverse's namespace -->
+                        <date />
+                    </reverse>
+                </sort>
+            </first>
+        </path>
+
+        <!-- turn the path into a property -->
+        <property name="eclipse.classpath" refid="newest.equinox.launcher.path.id" />
+    </target>
+
+    <target name="eclipse-classpath" depends="eclipse-startup-classpath,eclipse-launcher-classpath">
+        <echo message="Using equinox launcher jar: ${eclipse.classpath}" />
+    </target>
+
+    <macrodef name="osgi-version">
+        <attribute name="jar" />
+        <attribute name="outputproperty" />
+        <sequential>
+            <tstamp>
+                <format property="tstamp.@{jar}" pattern="yyyyMMddhhmmss" locale="en,UK"
/>
+            </tstamp>
+            <property name="work.dir.@{jar}" value="${work.dir}/${tstamp.@{jar}}" />
+            <mkdir dir="${work.dir.@{jar}}/jar" />
+            <unzip overwrite="true" src="@{jar}" dest="${work.dir.@{jar}}" />
+            <loadfile property="@{outputproperty}" srcFile="${work.dir.@{jar}}/META-INF/MANIFEST.MF">
+                <filterchain>
+                    <linecontains>
+                        <contains value="Bundle-Version:" />
+                    </linecontains>
+                    <tokenfilter>
+                        <replaceregex pattern="Bundle-Version: (.*)" replace="\1" flags="gi"
/>
+                    </tokenfilter>
+                    <striplinebreaks />
+                </filterchain>
+            </loadfile>
+            <delete dir="${work.dir.@{jar}}" />
+        </sequential>
+    </macrodef>
+
+    <target name="build-main-p2-repo">
+        <mkdir dir="${dist.dir}/main" />
+        <script language="javascript">project.setProperty("timestamp",java.lang.System.currentTimeMillis());</script>
+        <loadfile property="ASL2-header" srcFile="${basedir}/ASL2-header.xml"/>
+
+        <echo file="${dist.dir}/main/compositeArtifacts.xml"><![CDATA[<?xml version='1.0'
encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+${ASL2-header}
+<repository name='Apache IvyDE Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository'
version='1.0.0'>
+  <properties size='2'>
+    <property name='p2.timestamp' value='${timestamp}'/>
+    <property name='p2.compressed' value='false'/>
+  </properties>
+]]></echo>
+        <concat append="true" destfile="${dist.dir}/main/compositeArtifacts.xml">
+            <fileset dir="${basedir}" includes="versions.xml" />
+        </concat>
+        <echo append="true" file="${dist.dir}/main/compositeArtifacts.xml"><![CDATA[</repository>
+]]></echo>
+
+        <echo file="${dist.dir}/main/compositeContent.xml"><![CDATA[<?xml version='1.0'
encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+${ASL2-header}
+<repository name='Apache IvyDE Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository'
version='1.0.0'>
+  <properties size='2'>
+    <property name='p2.timestamp' value='${timestamp}'/>
+    <property name='p2.compressed' value='false'/>
+  </properties>
+]]></echo>
+        <concat append="true" destfile="${dist.dir}/main/compositeContent.xml">
+            <fileset dir="${basedir}" includes="versions.xml" />
+        </concat>
+        <echo append="true" file="${dist.dir}/main/compositeContent.xml"><![CDATA[</repository>
+]]></echo>
+    </target>
+
+    <!-- ========================================
+        Targets related to the P2 repo for IvyDE
+        ========================================
+    -->
+
+    <target name="build-ivyde-p2-repo" description="Build a P2 repository from an IvyDE
distribution">
+        <fail message="You have to specify the path to the zip of the IvyDE distribution
via the property ivyde.zip" unless="ivyde.zip" />
+        <!-- unzip -->
+        <delete dir="${work.dir}/ivyde" />
+        <mkdir dir="${work.dir}/ivyde" />
+        <unzip src="${ivyde.zip}" dest="${work.dir}/ivyde" />
+        <!-- get the path to the ivyde folder -->
+        <path id="ivyde.distrib.path.id">
+            <first count="1">
+                <dirset dir="${work.dir}/ivyde" includes="*" />
+            </first>
+        </path>
+        <!-- turn the path into a property -->
+        <property name="ivyde.distrib.path" refid="ivyde.distrib.path.id" />
+        <!-- install the new binaries -->
+        <delete dir="${dist.dir}/ivyde" />
+        <mkdir dir="${dist.dir}/ivyde" />
+        <copy todir="${dist.dir}/ivyde">
+            <fileset dir="${ivyde.distrib.path}">
+                <include name="plugins/**" />
+                <include name="features/**" />
+                <include name="*.xml" />
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- ======================================
+        Targets related to the P2 repo for Ivy
+        ======================================
+    -->
+
+    <target name="build-ivy-p2-repo" depends="get-ivy-plugin,generate-ivy-feature,generate-ivy-ant-feature,generate-ivy-ant-plugin,generate-ivy-p2-repo,generate-ivy-p2-category"
description="Build a P2 repository from an Ivy distribution">
+    </target>
+
+    <target name="get-ivy-plugin">
+        <fail message="You have to specify the path to the jar via the property ivy.jar"
unless="ivy.jar" />
+        <!-- get the real OSGi version of the bundle -->
+        <osgi-version jar="${ivy.jar}" outputproperty="ivy.version" />
+        <!-- install the plugin -->
+        <delete dir="${dist.dir}/ivy/plugins" />
+        <mkdir dir="${dist.dir}/ivy/plugins" />
+        <copy file="${ivy.jar}" tofile="${dist.dir}/ivy/plugins/org.apache.ivy_${ivy.version}.jar"
overwrite="true" />
+    </target>
+
+    <target name="generate-ivy-feature">
+        <!-- now take care of the generation of the Ivy feature -->
+        <!-- first generate a feature descriptor with the proper version -->
+        <delete file="${work.dir}/feature.xml" />
+        <copy file="ivy-feature-template/feature.xml" todir="${work.dir}">
+            <filterset>
+                <filter token="ivy.version" value="${ivy.version}" />
+            </filterset>
+        </copy>
+        <!-- package the feature -->
+        <mkdir dir="${dist.dir}/ivy/features" />
+        <jar destfile="${dist.dir}/ivy/features/org.apache.ivy.feature_${ivy.version}.jar">
+            <fileset dir="${basedir}/ivy-feature-template">
+                <include name="feature.properties" />
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+            <fileset dir="${work.dir}">
+                <include name="feature.xml" />
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="generate-ivy-ant-feature">
+        <!-- now take care of the generation of the Ivy Ant feature -->
+        <!-- first generate a feature descriptor with the proper version -->
+        <delete file="${work.dir}/feature.xml" />
+        <copy file="${basedir}/ivy-ant-feature-template/feature.xml" todir="${work.dir}">
+            <filterset>
+                <filter token="ivy.version" value="${ivy.version}" />
+            </filterset>
+        </copy>
+        <!-- package the feature -->
+        <mkdir dir="${dist.dir}/ivy/features" />
+        <jar destfile="${dist.dir}/ivy/features/org.apache.ivy.eclipse.ant.feature_${ivy.version}.jar">
+            <fileset dir="${basedir}/ivy-ant-feature-template">
+                <include name="feature.properties" />
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+            <fileset dir="${work.dir}">
+                <include name="feature.xml" />
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="generate-ivy-ant-plugin">
+        <fail message="You have to specify the path to the jar via the property ivy.jar"
unless="ivy.jar" />
+        <delete dir="${work.dir}/ivy-ant-plugin" />
+        <!-- put the jar of Ivy -->
+        <copy file="${ivy.jar}" tofile="${work.dir}/ivy-ant-plugin/ivy.jar" />
+        <!-- get the antlib.xml and produce a plugin.xml with it -->
+        <mkdir dir="${work.dir}/ivy-ant-plugin/ivyjar" />
+        <unzip src="${ivy.jar}" dest="${work.dir}/ivy-ant-plugin/ivyjar" />
+        <style in="${work.dir}/ivy-ant-plugin/ivyjar/org/apache/ivy/ant/antlib.xml" out="${work.dir}/ivy-ant-plugin/plugin.xml"
style="ivy-ant-plugin/antlib2plugin.xsl" />
+        <!-- put the manifest with the correct version -->
+        <osgi-version jar="${ivy.jar}" outputproperty="ivy.version" />
+        <copy file="${basedir}/ivy-ant-plugin/MANIFEST.MF" todir="${work.dir}/ivy-ant-plugin">
+            <filterset>
+                <filter token="VERSION" value="${ivy.version}"/>
+            </filterset>
+        </copy>
+        <!-- package the jar -->
+        <jar destfile="${dist.dir}/ivy/plugins/org.apache.ivy.eclipse.ant_${ivy.version}.jar"
manifest="${work.dir}/ivy-ant-plugin/MANIFEST.MF">
+            <fileset dir="${work.dir}/ivy-ant-plugin">
+                <include name="plugin.xml" />
+                <include name="ivy.jar" />
+            </fileset>
+            <fileset dir="ivy-ant-plugin">
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+        </jar>
+    </target>
+
+    <target name="generate-ivy-p2-repo" depends="eclipse-classpath">
+        <makeurl file="${dist.dir}/ivy" property="p2repo.url"/>
+        <java classpath="${eclipse.classpath}" classname="org.eclipse.core.launcher.Main"
fork="true" failonerror="true">
+            <arg line="-clean" />
+            <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher"
/>
+            <arg line="-metadataRepository ${p2repo.url}" />
+            <arg line="-artifactRepository ${p2repo.url}" />
+            <arg line="-metadataRepositoryName 'Apache Ivy P2 Eclipse repository'" />
+            <arg line="-artifactRepositoryName 'Apache Ivy P2 Eclipse repository'" />
+            <arg line="-source ${dist.dir}/ivy" />
+            <sysproperty key="eclipse.consoleLog" value="${eclipse.consoleLog}" />
+        </java>        
+    </target>
+
+    <target name="generate-ivy-p2-category" depends="eclipse-classpath">
+        <loadfile property="ASL2-header" srcFile="${basedir}/ASL2-header.xml"/>
+        <echo file="${work.dir}/category.xml"><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+<site>
+    <category-def name="org.apache.ivy.category" label="Apache Ivy library" />
+    <feature url="features/org.apache.ivy.feature_${ivy.version}.jar" id="org.apache.ivy.feature"
version="${ivy.version}">
+        <category name="org.apache.ivy.category"/>
+    </feature>
+    <feature url="features/org.apache.ivy.eclipse.ant.feature_${ivy.version}.jar" id="org.apache.ivy.eclipse.ant.feature"
version="${ivy.version}">
+        <category name="org.apache.ivy.category"/>
+    </feature>
+</site>
+]]></echo>
+        <makeurl file="${dist.dir}/ivy" property="p2repo.url"/>
+        <makeurl file="${work.dir}/category.xml" property="p2repo.category.url"/>
+        <java classpath="${eclipse.classpath}" classname="org.eclipse.core.launcher.Main"
fork="true" failonerror="true">
+            <arg line="-clean" />
+            <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher"
/>
+            <arg line="-metadataRepository ${p2repo.url}" />
+            <arg line="-categoryDefinition ${p2repo.category.url}" />
+            <arg line="-categoryQualifier" />
+            <sysproperty key="eclipse.consoleLog" value="${eclipse.consoleLog}" />
+        </java>
+        <!-- as we're at it, let's put the ASL header -->
+        <replaceregexp match="&lt;repository name='" replace="${ASL2-header}&lt;repository
name='" flags="g">
+            <fileset dir="${dist.dir}/ivy" includes="*.xml" />
+        </replaceregexp>
+    </target>
+
+</project>
\ No newline at end of file

Propchange: ant/ivy/updatesite/branches/p2repo-only/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/branches/p2repo-only/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/branches/p2repo-only/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/updatesite/branches/p2repo-only/category.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/category.xml?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/category.xml (added)
+++ ant/ivy/updatesite/branches/p2repo-only/category.xml Mon Oct 10 12:02:23 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+    <category-def name="ivy" label="Apache Ivy library" />
+    <category-def name="ivyde" label="Apache IvyDE Eclipse plugin" />
+
+   <feature url="features/org.apache.ivy.feature_2.2.1.alpha_20110727161442.jar" id="org.apache.ivy.feature"
version="2.2.1.alpha_20110727161442">
+      <category name="org.apache.ivy.category"/>
+   </feature>
+   <feature url="features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.2.0.201107271627-hudson-187.jar"
id="org.apache.ivyde.eclipse.resolvevisualizer.feature" version="2.2.0.201107271627-hudson-187">
+      <category name="org.apache.ivyde.category"/>
+   </feature>
+   <feature url="features/org.apache.ivyde.feature_2.2.0.201107271627-hudson-187.jar"
id="org.apache.ivyde.feature" version="2.2.0.201107271627-hudson-187">
+      <category name="org.apache.ivyde.category"/>
+   </feature>
+</site>

Propchange: ant/ivy/updatesite/branches/p2repo-only/category.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/branches/p2repo-only/category.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/branches/p2repo-only/category.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/updatesite/branches/p2repo-only/versions.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/branches/p2repo-only/versions.xml?rev=1180900&view=auto
==============================================================================
--- ant/ivy/updatesite/branches/p2repo-only/versions.xml (added)
+++ ant/ivy/updatesite/branches/p2repo-only/versions.xml Mon Oct 10 12:02:23 2011
@@ -0,0 +1,16 @@
+  <children size='14'>
+    <child location='ivyde-2.1.0'/>
+    <child location='http://archive.apache.org/dist/ant/ivyde/updatesite/ivyde-2.0.0.final'/>
+    <child location='http://archive.apache.org/dist/ant/ivyde/updatesite/ivyde-2.0.0.beta1'/>
+    <child location='http://archive.apache.org/dist/ant/ivyde/updatesite/ivyde-2.0.0.alpha1'/>
+    <child location='ivy-2.2.0'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.2.0-rc1'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.1.0'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.1.0-rc1'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.1.0-rc2'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.0.0'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.0.0-rc2'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.0.0-rc1'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.0.0-beta2'/>
+    <child location='http://archive.apache.org/dist/ant/ivy/updatesite/ivy-2.0.0-beta1'/>
+  </children>

Propchange: ant/ivy/updatesite/branches/p2repo-only/versions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/branches/p2repo-only/versions.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/branches/p2repo-only/versions.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message