You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2010/01/09 19:44:53 UTC
svn commit: r897515 - in /ant/ivy/updatesite/trunk: build.xml
ivy-ant-plugin/ ivy-ant-plugin/LICENSE ivy-ant-plugin/MANIFEST.MF
ivy-ant-plugin/NOTICE ivy-ant-plugin/antlib2plugin.xsl
Author: hibou
Date: Sat Jan 9 18:44:52 2010
New Revision: 897515
URL: http://svn.apache.org/viewvc?rev=897515&view=rev
Log:
IVYDE-171:
- add a generation of a plugin for Eclipse based on the Ivy jar.
Added:
ant/ivy/updatesite/trunk/ivy-ant-plugin/
ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE
ant/ivy/updatesite/trunk/ivy-ant-plugin/MANIFEST.MF
ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE
ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl (with props)
Modified:
ant/ivy/updatesite/trunk/build.xml
Modified: ant/ivy/updatesite/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=897515&r1=897514&r2=897515&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Sat Jan 9 18:44:52 2010
@@ -130,7 +130,7 @@
<jar destfile="${updatesite.dir}/features/org.apache.ivy.feature_${ivy.version}.jar">
<fileset dir="ivy-feature-template">
<include name="feature.properties" />
- <include name="LICENCE" />
+ <include name="LICENSE" />
<include name="NOTICE" />
</fileset>
<fileset dir="${work.dir}">
@@ -139,6 +139,35 @@
</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="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="${updatesite.dir}/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="put-ivyde-jars">
<fail message="You have to specify the path to the zip of the IvyDE distribution via the property ivyde.zip" unless="ivyde.zip" />
<!-- delete previously installed ivyde bundles -->
@@ -180,7 +209,7 @@
</target>
<target name="get-ivy-version">
- <!-- get the path to the ivyde plugin -->
+ <!-- get the path to the ivy plugin -->
<path id="ivy.plugin.path.id">
<first count="1">
<fileset dir="${updatesite.dir}/plugins" includes="org.apache.ivy_*.jar" />
@@ -208,7 +237,7 @@
</copy>
</target>
- <target name="install-ivy" depends="put-ivy-jar,generate-ivy-feature,get-ivyde-version,generate-site" description="Install an Ivy bundle into the updatesite" />
+ <target name="install-ivy" depends="put-ivy-jar,generate-ivy-feature,generate-ivy-ant-plugin,get-ivyde-version,generate-site" description="Install an Ivy bundle into the updatesite" />
<target name="install-ivyde" depends="put-ivyde-jars,get-ivyde-version,get-ivy-version,generate-site" description="Install IvyDE into the updatesite" />
Added: ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE?rev=897515&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-plugin/LICENSE Sat Jan 9 18:44:52 2010
@@ -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/trunk/ivy-ant-plugin/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-plugin/MANIFEST.MF?rev=897515&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-plugin/MANIFEST.MF (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-plugin/MANIFEST.MF Sat Jan 9 18:44:52 2010
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Ivy Ant Plugin
+Bundle-SymbolicName: org.apache.ivy.eclipse.ant;singleton:=true
+Bundle-Version: @VERSION@
+Bundle-Vendor: Apache Software Foundation
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ant.core,
+ org.apache.ant;bundle-version="1.7.0"
Added: ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE?rev=897515&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-plugin/NOTICE Sat Jan 9 18:44:52 2010
@@ -0,0 +1,5 @@
+Apache IvyDE updatesite
+Copyright 2007-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Added: ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl?rev=897515&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl Sat Jan 9 18:44:52 2010
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.w3.org/1999/XSL/Transform http://www.w3.org/1999/XSL/Transform.xsd" version="1.0">
+
+ <xsl:output method="xml" indent="yes" />
+
+ <xsl:template match="/antlib">
+ <xsl:processing-instruction name="eclipse">version="3.4"</xsl:processing-instruction>
+ <xsl:comment>
+ 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.
+ </xsl:comment>
+ <plugin>
+ <xsl:apply-templates select="child::node()" />
+ <extension point="org.eclipse.ant.core.extraClasspathEntries">
+ <extraClasspathEntry eclipseRuntime="false" headless="true" library="ivy.jar" />
+ </extension>
+ </plugin>
+ </xsl:template>
+
+ <xsl:template match="taskdef">
+ <extension point="org.eclipse.ant.core.antTasks">
+ <antTask name="{@name}" class="{@classname}" eclipseRuntime="false" headless="true" library="ivy.jar" />
+ </extension>
+ </xsl:template>
+
+ <xsl:template match="typedef">
+ <extension point="org.eclipse.ant.core.antTypes">
+ <antType name="{@name}" class="{@classname}" eclipseRuntime="false" headless="true" library="ivy.jar" />
+ </extension>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/updatesite/trunk/ivy-ant-plugin/antlib2plugin.xsl
------------------------------------------------------------------------------
svn:mime-type = text/xml