ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1059842 - in /ant/ivy/updatesite/trunk: ./ ivy-ant-feature-template/ ivy-feature-template/
Date Mon, 17 Jan 2011 10:18:37 GMT
Author: hibou
Date: Mon Jan 17 10:18:36 2011
New Revision: 1059842

URL: http://svn.apache.org/viewvc?rev=1059842&view=rev
Log:
IVYDE-271:
 - make the integration of the Ivy Ant tasks into Eclipse's runtime optional with an new Eclipse
feature

Added:
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project   (with props)
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/LICENSE
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/NOTICE
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties   (with props)
    ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml   (with props)
Modified:
    ant/ivy/updatesite/trunk/build.xml
    ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties
    ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=1059842&r1=1059841&r2=1059842&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Mon Jan 17 10:18:36 2011
@@ -174,6 +174,29 @@
         </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="ivy-ant-feature-template/feature.xml" todir="${work.dir}">
+            <filterset>
+                <filter token="ivy.version" value="${ivy.version}" />
+            </filterset>
+        </copy>
+        <!-- package the feature -->
+        <mkdir dir="${updatesite.dir}/features" />
+        <jar destfile="${updatesite.dir}/features/org.apache.ivy.eclipse.ant.feature_${ivy.version}.jar">
+            <fileset dir="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" />
@@ -284,6 +307,7 @@
         <!-- get the list of exiting Ivy Eclipse features -->
         <fileset id="ivy.feature.jars" dir="${updatesite.dir}/features">
             <include name="org.apache.ivy.feature_*.jar" />
+            <include name="org.apache.ivy.eclipse.ant.feature_*.jar" />
         </fileset>
         <!-- generate the entry for Ivy -->
         <generate-site-entries filesetid="ivy.feature.jars" category="ivy" />
@@ -307,11 +331,11 @@
         ===================================================================================================================
   
       -->
 
-    <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-ivy" depends="put-ivy-jar,generate-ivy-feature,generate-ivy-ant-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" />
 
-    <target name="install-ivy-and-ivyde" depends="put-ivy-jar,generate-ivy-feature,generate-ivy-ant-plugin,put-ivyde-jars,get-ivyde-version,generate-site"
description="Install Ivy and IvyDE into the updatesite" />
+    <target name="install-ivy-and-ivyde" depends="put-ivy-jar,generate-ivy-feature,generate-ivy-ant-feature,generate-ivy-ant-plugin,put-ivyde-jars,get-ivyde-version,generate-site"
description="Install Ivy and IvyDE into the updatesite" />
 
     <!-- 
         ===================================================================================================================

Added: ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project?rev=1059842&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project Mon Jan 17 10:18:36 2011
@@ -0,0 +1,35 @@
+<?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.    
+-->
+<projectDescription>
+	<name>org.apache.ivy.eclipse.ant.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/.project
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/updatesite/trunk/ivy-ant-feature-template/LICENSE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-feature-template/LICENSE?rev=1059842&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-feature-template/LICENSE (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-feature-template/LICENSE Mon Jan 17 10:18:36 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/trunk/ivy-ant-feature-template/NOTICE
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-feature-template/NOTICE?rev=1059842&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-feature-template/NOTICE (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-feature-template/NOTICE Mon Jan 17 10:18:36 2011
@@ -0,0 +1,6 @@
+Apache Ivy
+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/trunk/ivy-ant-feature-template/feature.properties
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties?rev=1059842&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties Mon Jan 17 10:18:36
2011
@@ -0,0 +1,44 @@
+#	 ***************************************************************
+#	 * 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.
+#	 ***************************************************************
+
+
+featureName=Apache Ivy Ant Tasks
+providerName=Apache Software Foundation
+
+updateSiteName=The Apache IvyDE Updates
+
+description=Apache Ivy Ant Tasks integrated into Eclipse's Ant runtime
+
+license=Licensed to the Apache Software Foundation (ASF) under one\n\
+or more contributor license agreements.  See the NOTICE file\n\
+distributed with this work for additional information\n\
+regarding copyright ownership.  The ASF licenses this file\n\
+to you under the Apache License, Version 2.0 (the\n\
+"License"); you may not use this file except in compliance\n\
+with the License.  You may obtain a copy of the License at\n\
+\n\
+  http://www.apache.org/licenses/LICENSE-2.0\n\
+\n\
+Unless required by applicable law or agreed to in writing,\n\
+software distributed under the License is distributed on an\n\
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
+KIND, either express or implied.  See the License for the\n\
+specific language governing permissions and limitations\n\
+under the License.
+

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml?rev=1059842&view=auto
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml (added)
+++ ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml Mon Jan 17 10:18:36 2011
@@ -0,0 +1,50 @@
+<?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.    
+-->
+<feature
+      id="org.apache.ivy.eclipse.ant.feature"
+      label="%featureName"
+      version="@ivy.version@"
+      provider-name="%providerName">
+
+   <description url="http://ant.apache.org/ivy">
+      %description
+   </description>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://www.apache.org/dist/ant/ivyde/updatesite"/>
+      <discovery label="%updateSiteName" url="http://www.apache.org/dist/ant/ivyde/updatesite"/>
+   </url>
+
+   <requires>
+       <import feature="org.apache.ivy.feature" version="@ivy.version@"/>
+   </requires>
+
+   <plugin
+         id="org.apache.ivy.eclipse.ant"
+         download-size="0"
+         install-size="0"
+         version="@ivy.version@"
+         unpack="true"/>
+
+</feature>

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/updatesite/trunk/ivy-ant-feature-template/feature.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties?rev=1059842&r1=1059841&r2=1059842&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties (original)
+++ ant/ivy/updatesite/trunk/ivy-feature-template/feature.properties Mon Jan 17 10:18:36 2011
@@ -23,7 +23,7 @@ providerName=Apache Software Foundation
 
 updateSiteName=The Apache IvyDE Updates
 
-description=Ivy bundle
+description=Apache Ivy is a popular dependency manager focusing on flexibility and simplicity
 
 license=Licensed to the Apache Software Foundation (ASF) under one\n\
 or more contributor license agreements.  See the NOTICE file\n\

Modified: ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml?rev=1059842&r1=1059841&r2=1059842&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml (original)
+++ ant/ivy/updatesite/trunk/ivy-feature-template/feature.xml Mon Jan 17 10:18:36 2011
@@ -43,11 +43,4 @@
          version="@ivy.version@"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.ivy.eclipse.ant"
-         download-size="0"
-         install-size="0"
-         version="@ivy.version@"
-         unpack="true"/>
-
 </feature>



Mime
View raw message