Author: hibou
Date: Wed Jul 1 08:39:23 2009
New Revision: 790069
URL: http://svn.apache.org/viewvc?rev=790069&view=rev
Log:
Merged revisions
786098,787242,787251,787588,787664,787666,787676,787682,789327,789346 via
svnmerge from
https://svn.eu.apache.org/repos/asf/ant/ivy/ivyde/trunk
........
r786098 | hibou | 2009-06-18 16:56:27 +0200 (jeu., 18 juin 2009) | 2 lines
Minor improvement to the release doc
........
r787242 | hibou | 2009-06-22 16:27:16 +0200 (lun., 22 juin 2009) | 2 lines
Allow debugging and use https more than http as loosing SSL make people log
out
........
r787251 | hibou | 2009-06-22 16:39:54 +0200 (lun., 22 juin 2009) | 2 lines
We should tag before voting for the release
........
r787588 | hibou | 2009-06-23 11:06:39 +0200 (mar., 23 juin 2009) | 2 lines
Add some release notes publishing when releasing
........
r787664 | hibou | 2009-06-23 15:09:16 +0200 (mar., 23 juin 2009) | 5 lines
Change the way the binary and source distribution is build:
- add license and notice
- add the generated doc into the binary distribution
- since the packaging changed, update the documentation about installing the
plugin manually
........
r787666 | hibou | 2009-06-23 15:17:03 +0200 (mar., 23 juin 2009) | 3 lines
- move CHANGES.txt next to the other text files
- fix the checksum and sign scripts
........
r787676 | hibou | 2009-06-23 16:01:01 +0200 (mar., 23 juin 2009) | 3 lines
- avoid duplicate template files
- document how to package the sources
........
r787682 | hibou | 2009-06-23 16:07:20 +0200 (mar., 23 juin 2009) | 3 lines
- remove useless settings
- add proper headers
........
r789327 | hibou | 2009-06-29 15:54:43 +0200 (lun., 29 juin 2009) | 3 lines
IVYDE-164:
- the implementation was still detecting some false positive which was not
allowing to edit containers
........
r789346 | hibou | 2009-06-29 16:46:02 +0200 (lun., 29 juin 2009) | 2 lines
Scripting the source packaging
........
Added:
ant/ivy/ivyde/branches/2.0.0-final/CHANGES.txt
- copied unchanged from r789346, ant/ivy/ivyde/trunk/CHANGES.txt
ant/ivy/ivyde/branches/2.0.0-final/LICENSE
- copied unchanged from r789346, ant/ivy/ivyde/trunk/LICENSE
ant/ivy/ivyde/branches/2.0.0-final/NOTICE
- copied unchanged from r789346, ant/ivy/ivyde/trunk/NOTICE
ant/ivy/ivyde/branches/2.0.0-final/README.txt
- copied unchanged from r789346, ant/ivy/ivyde/trunk/README.txt
ant/ivy/ivyde/branches/2.0.0-final/RELEASE_NOTES.txt
- copied unchanged from r789346, ant/ivy/ivyde/trunk/RELEASE_NOTES.txt
ant/ivy/ivyde/branches/2.0.0-final/doc/compatibility.html
- copied unchanged from r789346,
ant/ivy/ivyde/trunk/doc/compatibility.html
ant/ivy/ivyde/branches/2.0.0-final/doc/install.html
- copied unchanged from r789346, ant/ivy/ivyde/trunk/doc/install.html
ant/ivy/ivyde/branches/2.0.0-final/doc/template-eclipse.html
- copied unchanged from r789346,
ant/ivy/ivyde/trunk/doc/template-eclipse.html
Removed:
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.apache.ivyde.eclipse.prefs
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.jayasoft.ivyde.eclipse.prefs
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/CHANGES.txt
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/META-INF/LICENSE
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/META-INF/NOTICE
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.feature/LICENSE
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.feature/NOTICE
ant/ivy/ivyde/branches/2.0.0-final/template-eclipse-doc.html
Modified:
ant/ivy/ivyde/branches/2.0.0-final/ (props changed)
ant/ivy/ivyde/branches/2.0.0-final/build.xml
ant/ivy/ivyde/branches/2.0.0-final/builder/component/build.properties
ant/ivy/ivyde/branches/2.0.0-final/builder/component/customTargets.xml
ant/ivy/ivyde/branches/2.0.0-final/doc/config.json
ant/ivy/ivyde/branches/2.0.0-final/doc/dev/release.html
ant/ivy/ivyde/branches/2.0.0-final/doc/toc.json
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.ui.prefs
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
ant/ivy/ivyde/branches/2.0.0-final/signArtifacts.sh
ant/ivy/ivyde/branches/2.0.0-final/verifyArtifacts.sh
Propchange: ant/ivy/ivyde/branches/2.0.0-final/
------------------------------------------------------------------------------
svn:mergeinfo = /ant/ivy/ivyde/trunk:786098-789346
Propchange: ant/ivy/ivyde/branches/2.0.0-final/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 1 08:39:23 2009
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk:1-786055
+/ant/ivy/ivyde/trunk:1-790067
Modified: ant/ivy/ivyde/branches/2.0.0-final/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/build.xml?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/build.xml (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/build.xml Wed Jul 1 08:39:23 2009
@@ -36,11 +36,14 @@
<property name="work.dir" value="${basedir}/work" />
<property name="ivy.work.dir" value="${work.dir}/ivy" />
- <property name="doc.work.dir" value="${work.dir}/doc" />
- <property name="eclipse.work.dir" value="${work.dir}/eclipse" />
+ <property name="src.doc.dir" value="${basedir}/doc" />
<property name="dist.dir" value="${basedir}/dist" />
+ <property name="dist.work.dir" value="${work.dir}/dist" />
+ <property name="dist.work.doc.dir" value="${dist.work.dir}/doc" />
+ <property name="dist.work.src.dir" value="${dist.work.dir}/doc" />
+ <property name="doc-eclipse.work.dir" value="${work.dir}/doc-eclipse" />
+ <property name="eclipse.work.dir" value="${work.dir}/eclipse" />
<property name="eclipse-doc.dir"
value="${basedir}/org.apache.ivyde.eclipse/doc" />
- <property name="src.doc.dir" value="${basedir}/doc" />
<property name="checkstyle.src.dir"
value="${basedir}/org.apache.ivyde.eclipse/src/etc/checkstyle" />
<property name="checkstyle.report.dir"
value="${basedir}/checkstyle/report" />
<property name="checkstyle.lib" value="${basedir}/checkstyle/lib" />
@@ -50,7 +53,7 @@
<property name="forceContextQualifier"
value="${version.qualifier}-${DSTAMP}${TSTAMP}-RELEASE" />
</target>
- <target name="dist" depends="generate-eclipse-doc,build,sources,checksum"
description="Build every artifacts for distribution" />
+ <target name="dist"
depends="generate-eclipse-doc,build,package-binaries,package-sources,checksum"
description="Build every artifacts for distribution" />
<target name="clean" description="Remove every build artifacts">
<delete dir="${work.dir}" />
@@ -134,43 +137,72 @@
<sysproperty key="build.version" value="${build.version}" />
<sysproperty key="javacDebugInfo" value="true" />
</java>
- <mkdir dir="${dist.dir}" />
- <move
file="${eclipse.work.dir}/${build.version}/org.apache.ivyde.feature-${build.version}.zip"
todir="${dist.dir}" />
</target>
- <target name="sources" depends="compute-version" description="Create
source archive files">
- <mkdir dir="${dist.dir}" />
- <zip destfile="${dist.dir}/apache-ivyde-sources-${build.version}.zip">
+ <target name="generate-dist-doc-files">
+ <property name="checkUpToDate" value="true" />
+ <condition property="overwrite">
+ <isfalse value="${checkUpToDate}" />
+ </condition>
+ <mkdir dir="${dist.work.doc.dir}" />
+ <copy todir="${dist.work.doc.dir}" overwrite="${overwrite}">
+ <fileset dir="${src.doc.dir}">
+ <include name="style/**" />
+ <include name="js/**" />
+ <include name="images/**" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="generate-dist-doc-html">
+ <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
+ <property name="checkUpToDate" value="true" />
+ <mkdir dir="${dist.work.doc.dir}" />
+ <xooki:generate destDir="${dist.work.doc.dir}"
checkUpToDate="${checkUpToDate}">
+ <fileset dir="${src.doc.dir}">
+ <include name="**/*.html" />
+ <exclude name="template*.html" />
+ <exclude name="**/xooki/**" />
+ </fileset>
+ </xooki:generate>
+ </target>
+
+ <target name="package-binaries"
depends="build,generate-dist-doc-files,generate-dist-doc-html">
+ <unzip
src="${eclipse.work.dir}/${build.version}/org.apache.ivyde.feature-${build.version}.zip"
dest="${dist.work.dir}" />
+ <copy todir="${dist.work.dir}">
<fileset dir="${basedir}">
- <include name="site-template.xml" />
- <include name="build.xml" />
- <include name="build.properties" />
- <include name="builder/**" />
- <include name="org.apache.ivy.feature/build.properties" />
- <include name="org.apache.ivy.feature/feature.properties" />
- <include name="org.apache.ivy.feature/feature.xml" />
- <include name="org.apache.ivy.feature/LICENSE" />
- <include name="org.apache.ivy.feature/NOTICE" />
- <include name="org.apache.ivy.feature/.project" />
- <include name="org.apache.ivyde.eclipse/plugin.xml" />
- <include name="org.apache.ivyde.eclipse/build.properties" />
- <include name="org.apache.ivyde.eclipse/**/*.java" />
- <include name="org.apache.ivyde.eclipse/icons/**" />
- <include name="org.apache.ivyde.eclipse/META-INF/**" />
- <include name="org.apache.ivyde.eclipse/CHANGES.txt" />
- <include name="org.apache.ivyde.eclipse/.project" />
- <include name="org.apache.ivyde.eclipse/.classpath" />
- <include name="org.apache.ivyde.eclipse/.settings/**" />
- <include name="org.apache.ivyde.feature/feature.xml" />
- <include name="org.apache.ivyde.feature/feature.properties" />
- <include name="org.apache.ivyde.feature/build.properties" />
- <include name="org.apache.ivyde.feature/.project" />
- <include name="org.apache.ivyde.feature/LICENCE" />
- <include name="org.apache.ivyde.feature/NOTICE" />
- <include name="signArtifacts.sh" />
- <include name="verifyArtifacts.sh" />
+ <include name="LICENCE" />
+ <include name="NOTICE" />
+ <include name="CHANGES.txt" />
+ <include name="README.txt" />
+ <include name="RELEASE_NOTES.txt" />
</fileset>
- </zip>
+ </copy>
+ <mkdir dir="${dist.dir}" />
+ <zip destfile="${dist.dir}/apache-ivyde-${build.version}.zip"
basedir="${dist.work.dir}" />
+ <tar destfile="${dist.dir}/apache-ivyde-${build.version}.tgz"
basedir="${dist.work.dir}" compression="gzip" />
+ </target>
+
+ <target name="package-sources" depends="compute-version">
+ <exec executable="svn" dir="${basedir}" outputproperty="svn.info.url">
+ <arg value="--xml" />
+ <arg value="info" />
+ <redirector>
+ <outputfilterchain>
+ <containsregex pattern="<url>(.*)</url>"
replace="\1" />
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ <mkdir dir="${work.dir}" />
+ <delete dir="${work.dir}/sources" />
+ <exec executable="svn" dir="${work.dir}" >
+ <arg value="export" />
+ <arg value="${svn.info.url}" />
+ <arg value="sources" />
+ </exec>
+ <mkdir dir="${dist.dir}" />
+ <zip destfile="${dist.dir}/apache-ivyde-sources-${build.version}.zip"
basedir="${work.dir}/sources" />
+ <tar destfile="${dist.dir}/apache-ivyde-sources-${build.version}.tgz"
basedir="${work.dir}/sources" compression="gzip" />
</target>
<!--
@@ -286,14 +318,14 @@
<target name="checksum" description="Compute the checksum for every
artifact to distribute">
<checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
<fileset dir="${dist.dir}">
- <include name="org.apache.ivyde.feature-*.zip" />
- <include name="apache-ivyde-sources-*.zip" />
+ <include name="apache-ivyde-*.zip" />
+ <include name="apache-ivyde-*.tgz" />
</fileset>
</checksum>
<checksum algorithm="SHA" fileext=".sha" format="MD5SUM">
<fileset dir="${dist.dir}">
- <include name="org.apache.ivyde.feature-*.zip" />
- <include name="apache-ivyde-sources-*.zip" />
+ <include name="apache-ivyde-*.zip" />
+ <include name="apache-ivyde-*.tgz" />
</fileset>
</checksum>
</target>
@@ -301,8 +333,8 @@
<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="${dist.dir}">
- <include name="org.apache.ivyde.feature-*.zip" />
- <include name="apache-ivyde-sources-*.zip" />
+ <include name="apache-ivyde-*.zip" />
+ <include name="apache-ivyde-*.tgz" />
</fileset>
</checksum>
<fail message="MD5 Checksum verify failed !">
@@ -313,8 +345,8 @@
<echo message="MD5 Checksum verify passed successfully" />
<checksum algorithm="SHA" fileext=".sha" format="MD5SUM"
verifyproperty="checksum.sha.ok">
<fileset dir="${dist.dir}">
- <include name="org.apache.ivyde.feature-*.zip" />
- <include name="apache-ivyde-sources-*.zip" />
+ <include name="apache-ivyde-*.zip" />
+ <include name="apache-ivyde-*.tgz" />
</fileset>
</checksum>
<fail message="SHA Checksum verify failed !">
@@ -414,21 +446,21 @@
</target>
<target name="clean-eclipse-doc">
- <delete dir="${doc.work.dir}" />
+ <delete dir="${doc-eclipse.work.dir}" />
<delete dir="${eclipse-doc.dir}" />
</target>
<target name="generate-eclipse-doc-html">
<taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
- <copy todir="${doc.work.dir}">
+ <copy todir="${doc-eclipse.work.dir}">
<fileset dir="${src.doc.dir}" />
</copy>
- <copy file="${basedir}/template-eclipse-doc.html"
tofile="${doc.work.dir}/template.html" overwrite="true" />
+ <copy file="${src.doc.dir}/template-eclipse.html"
tofile="${doc-eclipse.work.dir}/template.html" overwrite="true" />
<property name="checkUpToDate" value="true" />
<xooki:generate destDir="${eclipse-doc.dir}"
checkUpToDate="${checkUpToDate}">
- <fileset dir="${doc.work.dir}">
+ <fileset dir="${doc-eclipse.work.dir}">
<include name="**/*.html" />
- <exclude name="template.html" />
+ <exclude name="template*.html" />
<exclude name="**/xooki/**" />
</fileset>
</xooki:generate>
Modified: ant/ivy/ivyde/branches/2.0.0-final/builder/component/build.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/builder/component/build.properties?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/builder/component/build.properties
(original)
+++ ant/ivy/ivyde/branches/2.0.0-final/builder/component/build.properties Wed
Jul 1 08:39:23 2009
@@ -17,7 +17,7 @@
# * under the License.
# ***************************************************************
-runPackager=true
+runPackager=false
# The prefix that will be used in the generated archive.
archivePrefix=
Modified: ant/ivy/ivyde/branches/2.0.0-final/builder/component/customTargets.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/builder/component/customTargets.xml?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/builder/component/customTargets.xml
(original)
+++ ant/ivy/ivyde/branches/2.0.0-final/builder/component/customTargets.xml Wed
Jul 1 08:39:23 2009
@@ -104,6 +104,18 @@
<!-- Steps to do after fetching the build elements -->
<!-- =====================================================================
-->
<target name="postFetch">
+ <copy todir="${buildDirectory}/features/org.apache.ivyde.feature/">
+ <fileset dir="${buildDirectory}/../..">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+ <copy
todir="${buildDirectory}/plugins/org.apache.ivyde.eclipse/META-INF/">
+ <fileset dir="${buildDirectory}/../..">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
</target>
<!-- =====================================================================
-->
Modified: ant/ivy/ivyde/branches/2.0.0-final/doc/config.json
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/doc/config.json?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/doc/config.json (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/doc/config.json Wed Jul 1 08:39:23 2009
@@ -1,5 +1,6 @@
{
- jira: {ids: ['IVYDE'], url: 'http://issues.apache.org/jira'},
+ debug: true,
+ jira: {ids: ['IVYDE'], url: 'https://issues.apache.org/jira'},
shortcuts: {
svn: {pre:
'https://svn.apache.org/repos/asf/ant/ivy/ivyde/trunk/'}
}
Modified: ant/ivy/ivyde/branches/2.0.0-final/doc/dev/release.html
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/doc/dev/release.html?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/doc/dev/release.html (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/doc/dev/release.html Wed Jul 1 08:39:23
2009
@@ -62,7 +62,20 @@
<h2>Release notes</h2>
-TODO: some release notes exists in
ivyde/trunk/org.apache.ivyde.eclipse/CHANGE.txt. Some work need to be done
before they can be published on the website.
+Go edit the RELEASE_NOTES.txt files. There are two things to change, marked by
some <tt>TODO WHEN RELEASING</tt>:
+<ul>
+ <li>the list of contributors should be filled according to the "thanks to"
in the CHANGE.txt file</li>
+ <li>the list of bug/features fixed in the release should be filled from
the one in the CHANGE.txt file</li>
+</ul>
+
+Edit the IvyDE doc and add a new page just under the root of the documentation
tree:
+<ul>
+ <li>Child page title: Release Notes</li>
+ <li>Child page path: release-notes</li>
+</ul>
+
+As content in that doc, copy paste the content of the RELEASE_NOTES.txt file.
+Then you should improve the style of the page by adding some h1, h2, remove
unwanted line break. Normally you shouldn't care about the http link or the
jira issue, xooki will take care of them.
<h2>Commit your change</h2>
@@ -73,14 +86,22 @@
Make sure you have a proper working copy with a <tt>svn status</tt>. You
should have no modification.
Then launch the build:
-<pre>ant /release clean dist</pre>
+<pre>ant /release clean dist -DbaseLocation=/home/me/...../eclipse/</pre>
+
And sign the artifacts:
<pre>./signArtifacts.sh</pre>
+Then it is time to tag the release as soon as you are happy with your
artifacts:
+
+<code>svn copy
https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION \
+ https://svn.apache.org/repos/asf/ant/ivy/ivyde/tags/$VERSION \
+ -m "Tag IvyDE release $VERSION"
+</code>
+
<h1>Prepare the updatesite</h1>
The instructions to build the updatesite are there:
-http://ant.apache.org/ivy/history/latest-milestone/updatesite.html
+http://ant.apache.org/ivy/history/trunk/dev/updatesite.html
<h1>Vote for the released artifacts</h1>
@@ -90,7 +111,7 @@
<pre>mkdir ~/public_html/ivyde-$VERSION/</pre>
And then the copy:
<pre>scp dist/*
[email protected]:/home/$LOGIN/public_html/ivyde-$VERSION/</pre>
-It is recommended to also deploy a staging updatesite there. See <a
href="http://ant.apache.org/ivy/history/latest-milestone/dev/updatesite.html";>that
page</a> to know how to proceed.
+It is recommended to also deploy a staging updatesite there. See <a
href="http://ant.apache.org/ivy/history/trunk/dev/updatesite.html";>that
page</a> to know how to proceed.
And launch the vote on the ant-dev mailing list:
<code>
@@ -114,14 +135,6 @@
Note: this <a href="http://ant.apache.org/bylaws.html";>page</a> is defining
when and how a release can be accepted.
-<h1>The release has been accepted</h1>
-
-Then it is time to tag the release:
-<code>svn copy
https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION \
- https://svn.apache.org/repos/asf/ant/ivy/ivyde/tags/$VERSION \
- -m "Tag IvyDE release $VERSION"
-</code>
-
<h1>Deployment</h1>
<h2>Publish the artifacts</h2>
Modified: ant/ivy/ivyde/branches/2.0.0-final/doc/toc.json
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/doc/toc.json?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/doc/toc.json (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/doc/toc.json Wed Jul 1 08:39:23 2009
@@ -5,6 +5,20 @@
"title":"Documentation",
"children": [
{
+ "id":"compatibility",
+ "title":"Compatibility",
+ "children": [
+
+ ]
+ },
+ {
+ "id":"install",
+ "title":"Installation",
+ "children": [
+
+ ]
+ },
+ {
"id":"cp_container",
"title":"Classpath Container",
"children": [
@@ -13,64 +27,64 @@
"title":"Create a container",
"children": [
- ]
+ ]
},
{
"id":"cpc/edit",
"title":"Edit the classpath",
"children": [
- ]
+ ]
},
{
"id":"cpc/resolve",
"title":"Launching resolve",
"children": [
- ]
+ ]
},
{
"id":"cpc/retrieve",
"title":"Retrieve the dependencies",
"children": [
- ]
+ ]
},
{
"id":"cpc/cleancache",
"title":"Clean the caches",
"children": [
- ]
+ ]
},
{
"id":"cpc/reload_settings",
"title":"Reload settings",
"children": [
- ]
+ ]
},
{
"id":"cpc/workspace",
"title":"Resolve in workspace",
"children": [
- ]
+ ]
},
{
"id":"cpc/maven",
"title":"Use with maven poms",
"children": [
- ]
+ ]
},
{
"id":"cpc/wtp",
"title":"WTP integration",
"children": [
- ]
- },
+ ]
+ }
]
},
{
Modified:
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
---
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs
(original)
+++
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.core.prefs
Wed Jul 1 08:39:23 2009
@@ -1,3 +1,21 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
#Thu Aug 28 12:33:46 CEST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
Modified:
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.ui.prefs?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
---
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.ui.prefs
(original)
+++
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/.settings/org.eclipse.jdt.ui.prefs
Wed Jul 1 08:39:23 2009
@@ -1,3 +1,21 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
#Tue Jun 05 13:26:22 CEST 2007
eclipse.preferences.version=1
formatter_profile=_Ivy Conventions
Modified:
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
---
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
(original)
+++
ant/ivy/ivyde/branches/2.0.0-final/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
Wed Jul 1 08:39:23 2009
@@ -100,11 +100,9 @@
private boolean exported;
- private boolean newContainer = false;
+ private String oldIvyFile = null;
- private String oldIvyFile;
-
- private List oldConfs;
+ private List oldConfs = null;
/**
* Constructor
@@ -121,38 +119,35 @@
String ivyFilePath = ivyFilePathText.getIvyFilePath();
List selectedConfigurations =
confTableViewer.getSelectedConfigurations();
- // we will check if there are duplicate if we are creating a new
container
- boolean checkDuplicate = newContainer;
- if (!checkDuplicate) {
- // or we are editing a classpath with different ivy and confs
than the initial ones
- checkDuplicate = !ivyFilePath.equals(oldIvyFile)
- || (selectedConfigurations.size() != oldConfs.size()
- || !oldConfs.containsAll(selectedConfigurations));
- }
-
- if (checkDuplicate) {
- // check that the chosen configuration doesn't already exist
- // the uniqueness is for xmlivyPath + conf
- List/* <IvyClasspathContainer> */containers = IvyClasspathUtil
- .getIvyClasspathContainers(project);
- if (containers != null) {
- Iterator/* <IvyClasspathContainer> */itContainers =
containers.iterator();
- while (error == null && itContainers.hasNext()) {
- IvyClasspathContainer ivycp = (IvyClasspathContainer)
itContainers.next();
- IvyClasspathContainerConfiguration cpc =
ivycp.getConf();
- if (cpc.ivyXmlPath.equals(ivyFilePath)) {
- if (selectedConfigurations.isEmpty()
- || selectedConfigurations.contains("*") ||
cpc.confs.isEmpty()
- || cpc.confs.contains("*")) {
+ // check that the chosen configuration doesn't already exist
+ // the uniqueness is for xmlivyPath + conf
+ List/* <IvyClasspathContainer> */containers = IvyClasspathUtil
+ .getIvyClasspathContainers(project);
+ if (containers != null) {
+ Iterator/* <IvyClasspathContainer> */itContainers =
containers.iterator();
+ while (error == null && itContainers.hasNext()) {
+ IvyClasspathContainer ivycp = (IvyClasspathContainer)
itContainers.next();
+ IvyClasspathContainerConfiguration cpc = ivycp.getConf();
+
+ // first check that this is not the one we are editing
+ if (oldIvyFile != null &&
cpc.ivyXmlPath.equals(oldIvyFile) && oldConfs != null
+ && oldConfs.size() == cpc.confs.size()
+ && oldConfs.containsAll(cpc.confs)) {
+ continue;
+ }
+
+ if (cpc.ivyXmlPath.equals(ivyFilePath)) {
+ if (selectedConfigurations.isEmpty()
+ || selectedConfigurations.contains("*") ||
cpc.confs.isEmpty()
+ || cpc.confs.contains("*")) {
+ error = "A container already exists for the
selected conf of "
+ + "the module descriptor";
+ } else {
+ ArrayList list = new ArrayList(cpc.confs);
+ list.retainAll(selectedConfigurations);
+ if (!list.isEmpty()) {
error = "A container already exists for the
selected conf of "
+ "the module descriptor";
- } else {
- ArrayList list = new ArrayList(cpc.confs);
- list.retainAll(selectedConfigurations);
- if (!list.isEmpty()) {
- error = "A container already exists for
the selected conf of "
- + "the module descriptor";
- }
}
}
}
@@ -249,12 +244,9 @@
}
public void setSelection(IFile ivyfile) {
- newContainer = true;
conf = new IvyClasspathContainerConfiguration(project,
ivyfile.getProjectRelativePath()
.toString(), true);
exported = false;
- oldIvyFile = conf.ivyXmlPath;
- oldConfs = conf.confs;
}
public void createControl(Composite parent) {
@@ -324,7 +316,7 @@
Label horizontalLine = new Label(headerComposite, SWT.SEPARATOR |
SWT.HORIZONTAL);
horizontalLine.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true, false, 2, 1));
- //CheckStyle:MagicNumber| OFF
+ // CheckStyle:MagicNumber| OFF
Composite configComposite = new Composite(composite, SWT.NONE);
configComposite.setLayout(new GridLayout(3, false));
configComposite.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true, true));
@@ -340,8 +332,8 @@
horizontalLine = new Label(configComposite, SWT.SEPARATOR |
SWT.HORIZONTAL);
horizontalLine.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true, false, 3, 1));
- //CheckStyle:MagicNumber| OFN
-
+ // CheckStyle:MagicNumber| OFN
+
// Label for ivy file field
Label pathLabel = new Label(configComposite, SWT.NONE);
pathLabel.setText("Ivy File");
Modified: ant/ivy/ivyde/branches/2.0.0-final/signArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/signArtifacts.sh?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/signArtifacts.sh (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/signArtifacts.sh Wed Jul 1 08:39:23 2009
@@ -19,5 +19,5 @@
read -s -p "Key passphrase: " passphrase
-for i in dist/apache-ivyde-sources-*.zip; do gpg --passphrase "$passphrase"
--output $i.asc --detach-sig --armor $i; done
-for i in dist/org.apache.ivyde.feature-*.zip; do gpg --passphrase
"$passphrase" --output $i.asc --detach-sig --armor $i; done
+for i in dist/apache-ivyde-*.zip; do gpg --passphrase "$passphrase" --output
$i.asc --detach-sig --armor $i; done
+for i in dist/apache-ivyde-*.tgz; do gpg --passphrase "$passphrase" --output
$i.asc --detach-sig --armor $i; done
Modified: ant/ivy/ivyde/branches/2.0.0-final/verifyArtifacts.sh
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.0.0-final/verifyArtifacts.sh?rev=790069&r1=790068&r2=790069&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.0.0-final/verifyArtifacts.sh (original)
+++ ant/ivy/ivyde/branches/2.0.0-final/verifyArtifacts.sh Wed Jul 1 08:39:23
2009
@@ -17,5 +17,5 @@
# specific language governing permissions and limitations
# under the License.
-for i in dist/apache-ivyde-sources-*.zip; do gpg --verify $i.asc; done
-for i in dist/org.apache.ivyde.feature-*.zip; do gpg --verify $i.asc; done
+for i in dist/apache-ivyde-*.zip; do gpg --verify $i.asc; done
+for i in dist/apache-ivyde-*.tgz; do gpg --verify $i.asc; done
