[jira] Commented: (IVY-907) Environment properties in ivy settings are no longer resolved
[
https://issues.apache.org/jira/browse/IVY-907?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12632544#action_12632544
]
Xavier Hanin commented on IVY-907:
--
Maarten: do you mean JIRA lost sg from you? I only added a comment. BTW, I
think your fix is not enough. Well, it should work as long as you use Ivy from
Ant. But if you use Ivy standalone, you can still have the same problem. Maybe
we could do the variable substitution when we set a variable? WDYT?
Environment properties in ivy settings are no longer resolved
-
Key: IVY-907
URL: https://issues.apache.org/jira/browse/IVY-907
Project: Ivy
Issue Type: Bug
Affects Versions: 2.0-RC1
Reporter: Erik-Berndt Scheper
Assignee: Maarten Coene
Fix For: 2.0.x
Attachments: IVY-907.zip, ivysettings.zip
I have an ivy.settings.xml file published on an intranet http server, which
includes a property file from the same http server. (see attached files).
This property file includes the property:
{code}ivy.cache.dir = ${env.IVY_CACHE_DIR}{code}
This environment based property is no longer resolved when I use the proposed
ivy-2.0.0-rc1.jar. This leads to the following error during resolve:
{noformat}
ivy.check:
ivy.init:
[mkdir] Created dir:
D:\ws\eclipse-3.4\AAD\AAD-domain-model\target\reports\ivy
ivy.resolve:
[ivy:resolve] :: Ivy 2.0.0-rc1 - 20080916082609 :: http://ant.apache.org/ivy/
::
:: loading settings :: url =
http://172.30.247.68/ivy-settings/ivy.settings.xml
BUILD FAILED
D:\ws\eclipse-3.4\AAD\build\build-ivy\build.ivy.xml:75:
java.lang.IllegalArgumentException: ivy.cache.dir must be absolute:
${env.IVY_CACHE_DIR}
Total time: 2 seconds
{noformat}
The same ivy settings files worked perfectly well with a previous ivy which I
built from trunk: org.apache.ivy_2.0.0.rc1_20080813101604.jar
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Commented: (IVY-907) Environment properties in ivy settings are no longer resolved
[
https://issues.apache.org/jira/browse/IVY-907?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12632566#action_12632566
]
Erik-Berndt Scheper commented on IVY-907:
-
Unfortunately I'm out of the office today, so I don't have time to check this
right now. I will certainly check it on Monday though, and provide feedback on
Maarten's fix and the suggested workarounds. I do agree with Xavier that this
is no blocker for rc1, although I would like to see it fixed for 2.0 final
(please).
BTW: Thanks for the quick turn-around.
Environment properties in ivy settings are no longer resolved
-
Key: IVY-907
URL: https://issues.apache.org/jira/browse/IVY-907
Project: Ivy
Issue Type: Bug
Affects Versions: 2.0-RC1
Reporter: Erik-Berndt Scheper
Assignee: Maarten Coene
Fix For: 2.0.x
Attachments: IVY-907.zip, ivysettings.zip
I have an ivy.settings.xml file published on an intranet http server, which
includes a property file from the same http server. (see attached files).
This property file includes the property:
{code}ivy.cache.dir = ${env.IVY_CACHE_DIR}{code}
This environment based property is no longer resolved when I use the proposed
ivy-2.0.0-rc1.jar. This leads to the following error during resolve:
{noformat}
ivy.check:
ivy.init:
[mkdir] Created dir:
D:\ws\eclipse-3.4\AAD\AAD-domain-model\target\reports\ivy
ivy.resolve:
[ivy:resolve] :: Ivy 2.0.0-rc1 - 20080916082609 :: http://ant.apache.org/ivy/
::
:: loading settings :: url =
http://172.30.247.68/ivy-settings/ivy.settings.xml
BUILD FAILED
D:\ws\eclipse-3.4\AAD\build\build-ivy\build.ivy.xml:75:
java.lang.IllegalArgumentException: ivy.cache.dir must be absolute:
${env.IVY_CACHE_DIR}
Total time: 2 seconds
{noformat}
The same ivy settings files worked perfectly well with a previous ivy which I
built from trunk: org.apache.ivy_2.0.0.rc1_20080813101604.jar
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Commented: (IVY-907) Environment properties in ivy settings are no longer resolved
[
https://issues.apache.org/jira/browse/IVY-907?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12632571#action_12632571
]
Xavier Hanin commented on IVY-907:
--
bq. Don't we already do a variable subsitution when we set a variable?
You're absolutely right! So the problem was *only* when used from Ant, and your
fix should be enough. Good job, sorry for the noise.
Environment properties in ivy settings are no longer resolved
-
Key: IVY-907
URL: https://issues.apache.org/jira/browse/IVY-907
Project: Ivy
Issue Type: Bug
Affects Versions: 2.0-RC1
Reporter: Erik-Berndt Scheper
Assignee: Maarten Coene
Fix For: 2.0.x
Attachments: IVY-907.zip, ivysettings.zip
I have an ivy.settings.xml file published on an intranet http server, which
includes a property file from the same http server. (see attached files).
This property file includes the property:
{code}ivy.cache.dir = ${env.IVY_CACHE_DIR}{code}
This environment based property is no longer resolved when I use the proposed
ivy-2.0.0-rc1.jar. This leads to the following error during resolve:
{noformat}
ivy.check:
ivy.init:
[mkdir] Created dir:
D:\ws\eclipse-3.4\AAD\AAD-domain-model\target\reports\ivy
ivy.resolve:
[ivy:resolve] :: Ivy 2.0.0-rc1 - 20080916082609 :: http://ant.apache.org/ivy/
::
:: loading settings :: url =
http://172.30.247.68/ivy-settings/ivy.settings.xml
BUILD FAILED
D:\ws\eclipse-3.4\AAD\build\build-ivy\build.ivy.xml:75:
java.lang.IllegalArgumentException: ivy.cache.dir must be absolute:
${env.IVY_CACHE_DIR}
Total time: 2 seconds
{noformat}
The same ivy settings files worked perfectly well with a previous ivy which I
built from trunk: org.apache.ivy_2.0.0.rc1_20080813101604.jar
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Commented: (IVY-907) Environment properties in ivy settings are no longer resolved
[
https://issues.apache.org/jira/browse/IVY-907?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12632573#action_12632573
]
Xavier Hanin commented on IVY-907:
--
Erik: if this doesn't go in rc1, it will go in 2.0 final only if another
blocking issue is found in rc1. Otherwise we will promote rc1 as 2.0 final. Bug
hunting is open!
That being said, it doesn't preclude releasing a 2.0.1 pretty quickly after
2.0.0, with this fix and others. But if we delay 2.0.0 with non blocking issues
it may last for too long.
Environment properties in ivy settings are no longer resolved
-
Key: IVY-907
URL: https://issues.apache.org/jira/browse/IVY-907
Project: Ivy
Issue Type: Bug
Affects Versions: 2.0-RC1
Reporter: Erik-Berndt Scheper
Assignee: Maarten Coene
Fix For: 2.0.x
Attachments: IVY-907.zip, ivysettings.zip
I have an ivy.settings.xml file published on an intranet http server, which
includes a property file from the same http server. (see attached files).
This property file includes the property:
{code}ivy.cache.dir = ${env.IVY_CACHE_DIR}{code}
This environment based property is no longer resolved when I use the proposed
ivy-2.0.0-rc1.jar. This leads to the following error during resolve:
{noformat}
ivy.check:
ivy.init:
[mkdir] Created dir:
D:\ws\eclipse-3.4\AAD\AAD-domain-model\target\reports\ivy
ivy.resolve:
[ivy:resolve] :: Ivy 2.0.0-rc1 - 20080916082609 :: http://ant.apache.org/ivy/
::
:: loading settings :: url =
http://172.30.247.68/ivy-settings/ivy.settings.xml
BUILD FAILED
D:\ws\eclipse-3.4\AAD\build\build-ivy\build.ivy.xml:75:
java.lang.IllegalArgumentException: ivy.cache.dir must be absolute:
${env.IVY_CACHE_DIR}
Total time: 2 seconds
{noformat}
The same ivy settings files worked perfectly well with a previous ivy which I
built from trunk: org.apache.ivy_2.0.0.rc1_20080813101604.jar
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
svn commit: r696975 - /ant/core/trunk/src/etc/performance/dirscanner.xml
Author: bodewig
Date: Fri Sep 19 01:23:24 2008
New Revision: 696975
URL: http://svn.apache.org/viewvc?rev=696975view=rev
Log:
optional bigger testbed with an order of magnitude more dirs and files.
Modified:
ant/core/trunk/src/etc/performance/dirscanner.xml
Modified: ant/core/trunk/src/etc/performance/dirscanner.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/performance/dirscanner.xml?rev=696975r1=696974r2=696975view=diff
==
--- ant/core/trunk/src/etc/performance/dirscanner.xml (original)
+++ ant/core/trunk/src/etc/performance/dirscanner.xml Fri Sep 19 01:23:24 2008
@@ -22,10 +22,15 @@
changes between Ant releases.
Before you run any tests, you need to set up the environment by
-running the setup target. Note that this will create a directory
-tree holding 1 directories and about 22000 files.
+running the setup or big-setup target. Note that this will create
+a directory tree holding 1 (setup) or 10 (big-setup)
+directories and about 22000 (setup) or 222000 (big-setup) files.
-The setup target requires Ant 1.7.0 or later.
+The setup/big-setup targets require Ant 1.7.0 or later. It may be
+a good idea to use the -logfile option.
+
+Consider taking a nap if you run Ant 1.6.x or 1.7.0 against a
+big setup.
The tests use the pathconvert task whose performance should be
dominated by directory scanner, they would use ressourcecount if
@@ -43,7 +48,7 @@
echoThis is ${ant.version}/echo
- target name=setup description=Sets up the environment for tests
+ target name=prepare-setup
mkdir dir=${test.dir}/src/org/apache/tools/ant/
mkdir dir=${test.dir}/dest/
echo file=${test.dir}/src/org/apache/tools/ant/DirscannerSetup.java
@@ -73,14 +78,32 @@
import org.apache.tools.ant.taskdefs.Touch;
public class DirscannerSetup extends Task {
+private boolean biggerSetup = false;
+
+public void setBig(boolean b) {
+biggerSetup = b;
+}
+
public void execute() {
Mkdir mkdir = new Mkdir();
mkdir.bindToOwner(this);
Touch touch = new Touch();
touch.bindToOwner(this);
String tmp = getProject().getProperty(test.dir);
+if (!biggerSetup) {
+createTree(new File(tmp), mkdir, touch);
+} else {
+for (int i = 0; i 10; i++) {
+File f = new File(tmp, String.valueOf(i));
+createTree(f, mkdir, touch);
+mkfiles(touch, f);
+}
+}
+}
+
+private static void createTree(File root, Mkdir mkdir, Touch touch) {
for (int i1 = 0; i1 10; i1++) {
-File f1 = new File(tmp, String.valueOf(i1));
+File f1 = new File(root, String.valueOf(i1));
for (int i2 = 0; i2 10; i2++) {
File f2 = new File(f1, String.valueOf(i2));
for (int i3 = 0; i3 10; i3++) {
@@ -113,9 +136,19 @@
pathelement location=${test.dir}/dest/
/classpath
/taskdef
+ /target
+
+ target name=setup description=Sets up the environment for tests
+ depends=prepare-setup
setup/
/target
+ target name=big-setup
+ description=Sets up the quot;bigquot; environment for tests
+ depends=prepare-setup
+ setup big=true/
+ /target
+
target name=cleanup
description=removes the tree generated by setup
delete dir=${test.dir}/
@@ -248,5 +281,5 @@
/target
target name=all
- depends=matchall, roots, recursive-excludes, name-matches,
many-patterns/
+ depends=matchall, roots, recursive-excludes, name-matches,
many-patterns, many-roots/
/project
svn commit: r697003 - in /ant/antlibs/antunit/trunk: changes.xml version.properties
Author: bodewig Date: Fri Sep 19 02:18:30 2008 New Revision: 697003 URL: http://svn.apache.org/viewvc?rev=697003view=rev Log: prepare for release Modified: ant/antlibs/antunit/trunk/changes.xml ant/antlibs/antunit/trunk/version.properties Modified: ant/antlibs/antunit/trunk/changes.xml URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=697003r1=697002r2=697003view=diff == --- ant/antlibs/antunit/trunk/changes.xml (original) +++ ant/antlibs/antunit/trunk/changes.xml Fri Sep 19 02:18:30 2008 @@ -37,7 +37,7 @@ titleApache AntUnit/title /properties - release version=SVN trunk date=unpublished + release version=1.1 date=2008-09-26 action type=fix issue=42745 assertFileExists example wrong, should use @file instead of @name /action Modified: ant/antlibs/antunit/trunk/version.properties URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/version.properties?rev=697003r1=697002r2=697003view=diff == --- ant/antlibs/antunit/trunk/version.properties (original) +++ ant/antlibs/antunit/trunk/version.properties Fri Sep 19 02:18:30 2008 @@ -12,4 +12,4 @@ # 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. -artifact.version=1.1beta2 +artifact.version=1.1
svn commit: r697005 - in /ant/antlibs/antunit/trunk: ./ version.properties
Author: bodewig Date: Fri Sep 19 02:23:06 2008 New Revision: 697005 URL: http://svn.apache.org/viewvc?rev=697005view=rev Log: open for new development Modified: ant/antlibs/antunit/trunk/ (props changed) ant/antlibs/antunit/trunk/version.properties Propchange: ant/antlibs/antunit/trunk/ -- --- svn:externals (original) +++ svn:externals Fri Sep 19 02:23:06 2008 @@ -1 +1 @@ -common http://svn.apache.org/repos/asf/ant/antlibs/common/tags/antunit_11 +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk Modified: ant/antlibs/antunit/trunk/version.properties URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/version.properties?rev=697005r1=697004r2=697005view=diff == --- ant/antlibs/antunit/trunk/version.properties (original) +++ ant/antlibs/antunit/trunk/version.properties Fri Sep 19 02:23:06 2008 @@ -12,4 +12,4 @@ # 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. -artifact.version=1.1 +artifact.version=1.2alpha
svn commit: r697020 - /ant/core/trunk/src/etc/performance/dirscanner.xml
Author: bodewig Date: Fri Sep 19 02:51:35 2008 New Revision: 697020 URL: http://svn.apache.org/viewvc?rev=697020view=rev Log: wrong property name Modified: ant/core/trunk/src/etc/performance/dirscanner.xml Modified: ant/core/trunk/src/etc/performance/dirscanner.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/performance/dirscanner.xml?rev=697020r1=697019r2=697020view=diff == --- ant/core/trunk/src/etc/performance/dirscanner.xml (original) +++ ant/core/trunk/src/etc/performance/dirscanner.xml Fri Sep 19 02:51:35 2008 @@ -186,7 +186,7 @@ target name=many-roots description=only contains include patterns that match starts -scan test=roots +scan test=many-roots patterns include name=0// include name=0/0//
[jira] Resolved: (IVYDE-52) Set current working dir to eclipse project location
[ https://issues.apache.org/jira/browse/IVYDE-52?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nicolas Lalevée resolved IVYDE-52. -- Resolution: Fixed Fix Version/s: 2.0 Assignee: Nicolas Lalevée Set current working dir to eclipse project location --- Key: IVYDE-52 URL: https://issues.apache.org/jira/browse/IVYDE-52 Project: IvyDE Issue Type: Improvement Affects Versions: 1.2.0 Reporter: Johannes Stamminger Assignee: Nicolas Lalevée Fix For: 2.0 Currently the working directory is the one having started eclipse from. We use in our ivy configurations relative pathes e.g. in the ivy settings file within an include. This does work currently only with having started eclipse from within the correct directory and we have to restart eclipse on switching the project. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
svn commit: r697032 - in /ant/core/trunk/src/main/org/apache/tools/ant: DirectoryScanner.java types/selectors/TokenizedPath.java
Author: bodewig
Date: Fri Sep 19 03:17:12 2008
New Revision: 697032
URL: http://svn.apache.org/viewvc?rev=697032view=rev
Log:
remove memoization which measurably (sp?) hurts performance more than it helps
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=697032r1=697031r2=697032view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Fri Sep
19 03:17:12 2008
@@ -281,18 +281,6 @@
// CheckStyle:VisibilityModifier ON
/**
- * Temporary table to speed up the various scanning methods.
- *
- * @since Ant 1.6
- */
-private Map fileListMap = new HashMap();
-
-/**
- * Uses fileListMap to cache directory listings.
- */
-private final TokenizedPath.FileLister fileLister = new CachedFileLister();
-
-/**
* List of all scanned directories.
*
* @since Ant 1.6
@@ -403,13 +391,6 @@
private int maxLevelsOfSymlinks = MAX_LEVELS_OF_SYMLINKS;
/**
- * Temporary table to speed up checking of canonical file names.
- *
- * @since Ant 1.8.0
- */
-private Map canonicalPathMap = new HashMap();
-
-/**
* Sole constructor.
*/
public DirectoryScanner() {
@@ -938,7 +919,7 @@
File canonBase = null;
if (basedir != null) {
try {
-canonBase = getCanonicalFile(basedir);
+canonBase = basedir.getCanonicalFile();
} catch (IOException ex) {
throw new BuildException(ex);
}
@@ -959,12 +940,11 @@
// we need to double check.
try {
String path = (basedir == null)
-? getCanonicalPath(myfile)
+? myfile.getCanonicalPath()
: FILE_UTILS.removeLeadingPath(canonBase,
- getCanonicalFile(myfile));
+ myfile.getCanonicalFile());
if (!path.equals(currentelement) || ON_VMS) {
-myfile = currentPath.findFile(basedir, true,
- fileLister);
+myfile = currentPath.findFile(basedir, true);
if (myfile != null basedir != null) {
currentelement = FILE_UTILS.removeLeadingPath(
basedir, myfile);
@@ -981,7 +961,7 @@
}
if ((myfile == null || !myfile.exists())
!isCaseSensitive()) {
-File f = currentPath.findFile(basedir, false, fileLister);
+File f = currentPath.findFile(basedir, false);
if (f != null f.exists()) {
// adapt currentelement to the case we've
// actually found
@@ -1169,7 +1149,7 @@
if (dir == null) {
throw new BuildException(dir must not be null.);
}
-String[] newfiles = list(dir);
+String[] newfiles = dir.list();
if (newfiles == null) {
if (!dir.exists()) {
throw new BuildException(dir + DOES_NOT_EXIST_POSTFIX);
@@ -1223,7 +1203,7 @@
String name = vpath + newfiles[i];
TokenizedPath newPath = new TokenizedPath(path, newfiles[i]);
File file = new File(dir, newfiles[i]);
-String[] children = list(file);
+String[] children = file.list();
if (children == null) { // probably file
if (isIncluded(newPath)) {
accountForIncludedFile(newPath, file);
@@ -1721,37 +1701,6 @@
return new FileResource(basedir, name);
}
-private static final String[] NULL_FILE_LIST = new String[0];
-
-/**
- * Return a cached result of list performed on file, if
- * available. Invokes the method and caches the result otherwise.
- *
- * @param file File (dir) to list.
- * @since Ant 1.6
- */
-private String[] list(File file) {
-String[] files = null;
-SoftReference s = (SoftReference) fileListMap.get(file);
-if (s != null) {
-files = (String[]) s.get();
-if (files == null) {
-fileListMap.remove(file);
-}
-}
-if (files == null) {
-files = file.list();
-if (files != null) {
-
svn commit: r697038 - /ant/core/trunk/src/etc/performance/dirscanner.xml
Author: bodewig
Date: Fri Sep 19 03:33:29 2008
New Revision: 697038
URL: http://svn.apache.org/viewvc?rev=697038view=rev
Log:
alternative scan task that uses resourcecount to isolate memory effect of
pathconvert (and its result) from scanning
Modified:
ant/core/trunk/src/etc/performance/dirscanner.xml
Modified: ant/core/trunk/src/etc/performance/dirscanner.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/performance/dirscanner.xml?rev=697038r1=697037r2=697038view=diff
==
--- ant/core/trunk/src/etc/performance/dirscanner.xml (original)
+++ ant/core/trunk/src/etc/performance/dirscanner.xml Fri Sep 19 03:33:29 2008
@@ -32,9 +32,11 @@
Consider taking a nap if you run Ant 1.6.x or 1.7.0 against a
big setup.
-The tests use the pathconvert task whose performance should be
-dominated by directory scanner, they would use ressourcecount if
-that had been available in Ant 1.6.5.
+If Ant 1.6.x is detected or the property ant16 has been specified
+on the command line then the tests will use the pathconvert task
+instead of resourcecount. So if you want to compare Ant 1.6.x
+with later versions of you must specify ant16 on the command line
+during your 1.[78].x tests.
The tests will use the default settings of followsymlinks=true
and casesensitive=true unless those values get overwritten by
@@ -46,6 +48,10 @@
property name=symlinks value=true/
property name=casesensitive value=true/
+ condition property=ant16
+contains string=${ant.version} substring=1.6./
+ /condition
+
echoThis is ${ant.version}/echo
target name=prepare-setup
@@ -154,6 +160,7 @@
delete dir=${test.dir}/
/target
+ target name=define-scan-16 if=ant16
macrodef name=scan
attribute name=test/
element name=patterns optional=true/
@@ -168,13 +175,33 @@
/pathconvert
/sequential
/macrodef
+ /target
+
+ target name=define-scan-17+ unless=ant16
+macrodef name=scan
+ attribute name=test/
+ element name=patterns optional=true/
+ sequential
+resourcecount property=@{test}
+ fileset dir=${test.dir} followSymlinks=${symlinks}
+ casesensitive=${casesensitive}
+patterns/
+ /fileset
+/resourcecount
+ /sequential
+/macrodef
+ /target
+
+ target name=define-scan depends=define-scan-16,define-scan-17+/
target name=matchall
+ depends=define-scan
description=doesn't specify any patterns
scan test=matchall/
/target
target name=roots
+ depends=define-scan
description=only contains include patterns that match starts
scan test=roots
patterns
@@ -185,6 +212,7 @@
/target
target name=many-roots
+ depends=define-scan
description=only contains include patterns that match starts
scan test=many-roots
patterns
@@ -233,6 +261,7 @@
/target
target name=recursive-excludes
+ depends=define-scan
description=specifies include and exclude patterns with wildcards
scan test=recursive-excludes
patterns
@@ -243,6 +272,7 @@
/target
target name=name-matches
+ depends=define-scan
description=specifies include and exclude patterns matching on file
names
scan test=names-matches
patterns
@@ -253,6 +283,7 @@
/target
target name=many-patterns
+ depends=define-scan
description=specifies many include and exclude patterns
scan test=many-patterns
patterns
@@ -281,5 +312,5 @@
/target
target name=all
- depends=matchall, roots, recursive-excludes, name-matches,
many-patterns, many-roots/
+ depends=define-scan,matchall, roots, recursive-excludes,
name-matches, many-patterns, many-roots/
/project
svn commit: r697073 - /ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
Author: bodewig
Date: Fri Sep 19 05:48:58 2008
New Revision: 697073
URL: http://svn.apache.org/viewvc?rev=697073view=rev
Log:
no need to clone a linked list to iterate through it
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=697073r1=697072r2=697073view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Fri Sep
19 05:48:58 2008
@@ -1785,20 +1785,21 @@
private boolean causesIllegalSymlinkLoop(String dirName, File parent,
LinkedList
directoryNamesFollowed) {
try {
-if (CollectionUtils.frequency(directoryNamesFollowed, dirName)
+if (directoryNamesFollowed.size() = maxLevelsOfSymlinks
+ CollectionUtils.frequency(directoryNamesFollowed, dirName)
= maxLevelsOfSymlinks
FILE_UTILS.isSymbolicLink(parent, dirName)) {
-LinkedList s = (LinkedList) directoryNamesFollowed.clone();
ArrayList files = new ArrayList();
File f = FILE_UTILS.resolveFile(parent, dirName);
String target = f.getCanonicalPath();
files.add(target);
String relPath = ;
-while (s.size() 0) {
+for (Iterator i = directoryNamesFollowed.iterator();
+ i.hasNext(); ) {
relPath += ../;
-String dir = (String) s.removeFirst();
+String dir = (String) i.next();
if (dirName.equals(dir)) {
f = FILE_UTILS.resolveFile(parent, relPath + dir);
files.add(f.getCanonicalPath());
svn commit: r697116 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
Author: bodewig
Date: Fri Sep 19 07:51:27 2008
New Revision: 697116
URL: http://svn.apache.org/viewvc?rev=697116view=rev
Log:
make log more usefull. PR 45841.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java?rev=697116r1=697115r2=697116view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java Fri
Sep 19 07:51:27 2008
@@ -225,9 +225,9 @@
for (int i = 0; i list.length; i++) {
File f = new File(list[i]);
if (f.exists()) {
-acl.addPathElement(f.getAbsolutePath());
log(Adding to class loader + acl + +
f.getAbsolutePath(),
Project.MSG_DEBUG);
+acl.addPathElement(f.getAbsolutePath());
}
}
}
DO NOT REPLY [Bug 45841] Classloader task - move log message
https://issues.apache.org/bugzilla/show_bug.cgi?id=45841 Stefan Bodewig [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.8.0 --- Comment #1 from Stefan Bodewig [EMAIL PROTECTED] 2008-09-19 07:51:41 PST --- committed as svn rev 697116, thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
DO NOT REPLY [Bug 45836] [PATCH] For correct empty CBzip2OutputStream handling
https://issues.apache.org/bugzilla/show_bug.cgi?id=45836 Stefan Bodewig [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.8.0 --- Comment #1 from Stefan Bodewig [EMAIL PROTECTED] 2008-09-19 08:05:11 PST --- patch committed as svn revision 697122, thanks! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
svn commit: r697122 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW contributors.xml src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
Author: bodewig
Date: Fri Sep 19 08:04:54 2008
New Revision: 697122
URL: http://svn.apache.org/viewvc?rev=697122view=rev
Log:
create useable output even if the input is empty. PR 45836. Submitted by Tom
May.
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=697122r1=697121r2=697122view=diff
==
Binary files - no diff available.
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=697122r1=697121r2=697122view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Sep 19 08:04:54 2008
@@ -56,7 +56,7 @@
* CBZip2InputStream will now throw an IOException if
passed in a null or empty InputStream to read from.
- Bugzilla Report 32200
+ Bugzilla Reports 32200.
* unzip will now fail when trying to extract certain broken
archives that would have been silently ignored in earlier version.
@@ -166,9 +166,9 @@
* CBZip2OutputStream threw an exception if it was closed prior to
writing anything.
- Bugzilla Report 32200
+ Bugzilla Reports 32200, 45836
- * The IPlanetDeploymentToll didn't use the configured DTD locations.
+ * The IPlanetDeploymentTool didn't use the configured DTD locations.
Bugzilla Report 31876.
* The ant shell script printed a warning unser Cygwin if JAVA_HOME
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=697122r1=697121r2=697122view=diff
==
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Fri Sep 19 08:04:54 2008
@@ -1168,6 +1168,10 @@
lastEugelink/last
/name
name
+firstTom/first
+lastMay/last
+ /name
+ name
firstTrejkaz/first
lastXaoz/last
/name
Modified: ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java?rev=697122r1=697121r2=697122view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java Fri
Sep 19 08:04:54 2008
@@ -434,6 +434,12 @@
combinedCRC = (combinedCRC 1) | (combinedCRC 31);
combinedCRC ^= blockCRC;
+// If the stream was empty we must skip the rest of this method.
+// See bug#32200.
+if (last == -1) {
+ return;
+}
+
/* sort the block and establish posn of original string */
doReversibleTransformation();
@@ -1131,15 +1137,7 @@
*/
// if (verbosity = 4) fprintf ( stderr,sort initialise ...\n
);
-
-// set last to zero in case it's never been set before
-// see bug#32200, initBlock is the real culprit
-// setting last to -1, but not sure if this -1 is important
-// in normal scheme
-if (last 0) {
-last = 0;
-}
-
+
for (i = 0; i NUM_OVERSHOOT_BYTES; i++) {
block[last + i + 2] = block[(i % (last + 1)) + 1];
}
DO NOT REPLY [Bug 45845] New: Possibly remove reverse() in Classloader task
https://issues.apache.org/bugzilla/show_bug.cgi?id=45845
Summary: Possibly remove reverse() in Classloader task
Product: Ant
Version: 1.7.1
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Core tasks
AssignedTo: notifications@ant.apache.org
ReportedBy: [EMAIL PROTECTED]
Can we drop one of these, I was trying both not realizing that they were
changing the same property, but in reverse.
/**
* Set reverse attribute.
* @param b if true reverse the normal classloader lookup.
*/
public void setReverse(boolean b) {
this.parentFirst = !b;
}
/**
* Set reverse attribute.
* @param b if true reverse the normal classloader lookup.
*/
public void setParentFirst(boolean b) {
this.parentFirst = b;
}
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
DO NOT REPLY [Bug 39189] signjar should permit selection of alternate executable
https://issues.apache.org/bugzilla/show_bug.cgi?id=39189 Stefan Bodewig [EMAIL PROTECTED] changed: What|Removed |Added CC||notifications@ant.apache.org AssignedTo|notifications@ant.apache.org|[EMAIL PROTECTED] -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. You are the assignee for the bug.
svn commit: r697133 - in /ant/core/trunk: WHATSNEW docs/manual/CoreTasks/signjar.html src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
Author: bodewig
Date: Fri Sep 19 08:28:34 2008
New Revision: 697133
URL: http://svn.apache.org/viewvc?rev=697133view=rev
Log:
allow executable of signjar and verifyjat to be configured. PR 39189.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/CoreTasks/signjar.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=697133r1=697132r2=697133view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Sep 19 08:28:34 2008
@@ -371,6 +371,10 @@
ProjectHelper2 will be used just like in ant 1.7.1.
Bugzilla Report 42208.
+ * It is now possible to explicitly set the executable used by
+ signjar.
+ Bugzilla Report 39189.
+
Changes from Ant 1.7.0 TO Ant 1.7.1
=
Modified: ant/core/trunk/docs/manual/CoreTasks/signjar.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/signjar.html?rev=697133r1=697132r2=697133view=diff
==
--- ant/core/trunk/docs/manual/CoreTasks/signjar.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/signjar.html Fri Sep 19 08:28:34 2008
@@ -141,7 +141,17 @@
timestamped JAR files in Java1.5+/td
td valign=top align=centerNo/td
/tr
-
+ tr
+td valign=topexecutable/td
+td valign=topSpecify a particular codejarsigner/code executable
+ to use in place of the default binary (found in the same JDK as
+ Ant is running in).br/
+ Must support the same command line options as the Sun JDK
+ jarsigner command.
+ emsince Ant 1.8.0/em./td
+td align=center valign=topall/td
+td align=center valign=topNo/td
+ /tr
/table
h3Parameters as nested elements/h3
table border=1 cellpadding=2 cellspacing=0
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java?rev=697133r1=697132r2=697133view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
Fri Sep 19 08:28:34 2008
@@ -104,6 +104,13 @@
private Path path = null;
/**
+ * The executable to use instead of jarsigner.
+ *
+ * @since Ant 1.8.0
+ */
+private String executable;
+
+/**
* Set the maximum memory to be used by the jarsigner process
*
* @param max a string indicating the maximum memory according to the JVM
@@ -251,6 +258,16 @@
}
/**
+ * Sets the actual executable command to invoke, instead of the binary
+ * codejarsigner/code found in Ant's JDK.
+ * @param executable the command to invoke.
+ * @since Ant 1.8.0
+ */
+public void setExecutable(String executable) {
+this.executable = executable;
+}
+
+/**
* these are options common to signing and verifying
* @param cmd command to configure
*/
@@ -315,7 +332,11 @@
*/
protected ExecTask createJarSigner() {
final ExecTask cmd = new ExecTask(this);
-cmd.setExecutable(JavaEnvUtils.getJdkExecutable(JARSIGNER_COMMAND));
+if (executable == null) {
+
cmd.setExecutable(JavaEnvUtils.getJdkExecutable(JARSIGNER_COMMAND));
+} else {
+cmd.setExecutable(executable);
+}
cmd.setTaskType(JARSIGNER_COMMAND);
cmd.setFailonerror(true);
cmd.addConfiguredRedirector(redirector);
DO NOT REPLY [Bug 39189] signjar should permit selection of alternate executable
https://issues.apache.org/bugzilla/show_bug.cgi?id=39189 Stefan Bodewig [EMAIL PROTECTED] changed: What|Removed |Added Severity|normal |enhancement Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.8.0 --- Comment #3 from Stefan Bodewig [EMAIL PROTECTED] 2008-09-19 08:28:51 PST --- supported starting with svn revision 697133. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug.
svn commit: r697139 - in /ant/core/trunk: WHATSNEW src/etc/testcases/taskdefs/signjar.xml src/etc/testcases/testkeystore src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java src/tests/junit/
Author: bodewig
Date: Fri Sep 19 08:53:20 2008
New Revision: 697139
URL: http://svn.apache.org/viewvc?rev=697139view=rev
Log:
properly handle non-standard chars in key alias. PR 45820.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/etc/testcases/taskdefs/signjar.xml
ant/core/trunk/src/etc/testcases/testkeystore
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=697139r1=697138r2=697139view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Sep 19 08:53:20 2008
@@ -222,6 +222,10 @@
regardless of their configuration.
Bugzilla Report 37970.
+ * signjar and issigned didn't handle aliases with characters other
+ than numbers, letters, hyphen or underscore properly.
+ Bugzilla Report 45820.
+
Other changes:
--
Modified: ant/core/trunk/src/etc/testcases/taskdefs/signjar.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/signjar.xml?rev=697139r1=697138r2=697139view=diff
==
--- ant/core/trunk/src/etc/testcases/taskdefs/signjar.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/signjar.xml Fri Sep 19 08:53:20
2008
@@ -80,6 +80,11 @@
assertSigned/
/target
+ target name=invalidchars depends=jar
+sign alias=[EMAIL PROTECTED]/
+assertSigned/
+ /target
+
target name=maxmemory depends=jar
sign maxmemory=128m/
assertSigned/
Modified: ant/core/trunk/src/etc/testcases/testkeystore
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/testkeystore?rev=697139r1=697138r2=697139view=diff
==
Binary files - no diff available.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java?rev=697139r1=697138r2=697139view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
Fri Sep 19 08:53:20 2008
@@ -23,6 +23,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.ManifestTask;
import org.apache.tools.ant.types.DataType;
import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
@@ -84,6 +85,7 @@
}
return false;
}
+name = replaceInvalidChars(name);
boolean shortSig = jarFile.getEntry(SIG_START
+ name.toUpperCase()
+ SIG_END) != null;
@@ -131,4 +133,20 @@
}
return r;
}
+
+private static String replaceInvalidChars(final String name) {
+StringBuffer sb = new StringBuffer();
+final int len = name.length();
+boolean changes = false;
+for (int i = 0; i len; i++) {
+final char ch = name.charAt(i);
+if (ManifestTask.VALID_ATTRIBUTE_CHARS.indexOf(ch) 0) {
+sb.append(_);
+changes = true;
+} else {
+sb.append(ch);
+}
+}
+return changes ? sb.toString() : name;
+}
}
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java?rev=697139r1=697138r2=697139view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
Fri Sep 19 08:53:20 2008
@@ -70,6 +70,17 @@
sj.isSigned());
}
+public void testInvalidChars() {
+executeTarget(invalidchars);
+SignJarChild sj = new SignJarChild();
+sj.setAlias([EMAIL PROTECTED]);
+sj.setKeystore(testkeystore);
+sj.setStorepass(apacheant);
+File jar = new File(getProject().getProperty(test.jar));
+sj.setJar(jar);
+assertTrue(sj.isSigned());
+}
+
/**
* subclass in order to get access to protected isSigned method if
* tests and task come from different classloaders.
DO NOT REPLY [Bug 45820] IsSigned conditions doesn't work correctly for alias with invalid characters
https://issues.apache.org/bugzilla/show_bug.cgi?id=45820 Stefan Bodewig [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Stefan Bodewig [EMAIL PROTECTED] 2008-09-19 08:53:38 PST --- svn revision 697139 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug.
DO NOT REPLY [Bug 45846] New: Ant 1.7.1 resolves UNC path file imports incorrectly on windows
https://issues.apache.org/bugzilla/show_bug.cgi?id=45846 Summary: Ant 1.7.1 resolves UNC path file imports incorrectly on windows Product: Ant Version: 1.7.1 Platform: PC OS/Version: Windows XP Status: NEW Severity: major Priority: P2 Component: Core AssignedTo: notifications@ant.apache.org ReportedBy: [EMAIL PROTECTED] Hi, I have a core build file deployed on a network file system that is accessible from both windows and unix. This core build file is imported and used by a number of other project builds that just provide properties to configure the core build for usage. The core build file imports a number of other files containing utility macrodefs etc. These are deployed in the same directory as the core build (I use the dirname task to construct the import path for the other files). It uses UNC style paths to do this, for example: import file=//u/some/path/accessible/from/windows/and/unix/machines/build.xml/ Paths like this were handled without issue in ant 1.6.5. On unix the extra forward slash was irrelevant and on windows the path seps were flipped by java to yield a valid UNC path. However, if I run the following import on windows under a Java 6 VM with ant 1.7.1 I now get this error: Cannot find build-utils.xml imported from C:\u\some\path\accessible\from\windows\and\unix\machines\build.xml I have seen a related problem if I put ant on the path using a UNC path (e.g. if I deploy my ant install on a network drive). When I run ant I get this exception. java.lang.ClassNotFoundException: org.apache.tools.ant.Main at java.net.URLClassLoader$1.run(URLClassLoader.java:200) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:188) at java.lang.ClassLoader.loadClass(ClassLoader.java:306) at java.lang.ClassLoader.loadClass(ClassLoader.java:251) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:255) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:104) This goes if I map a network drive to the ant deployment directory and put it on the path using a path via this drive instead. Does anyone know what's going one here? Thanks, Miles -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug.
svn commit: r697194 - in /ant/ivy/ivyde/trunk: build.properties build.xml org.apache.ivy.feature/
Author: hibou
Date: Fri Sep 19 12:18:43 2008
New Revision: 697194
URL: http://svn.apache.org/viewvc?rev=697194view=rev
Log:
- remove the now useless ivy feature which is now managed when updating the
updatesite
- make the installation of the ivy bundle more configurable
Removed:
ant/ivy/ivyde/trunk/org.apache.ivy.feature/
Modified:
ant/ivy/ivyde/trunk/build.properties
ant/ivy/ivyde/trunk/build.xml
Modified: ant/ivy/ivyde/trunk/build.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=697194r1=697193r2=697194view=diff
==
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Fri Sep 19 12:18:43 2008
@@ -19,3 +19,4 @@
version.qualifier=beta1
outputUpdateJars=true
+ivy.version=2.0.0-beta2
Modified: ant/ivy/ivyde/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=697194r1=697193r2=697194view=diff
==
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Fri Sep 19 12:18:43 2008
@@ -161,10 +161,10 @@
!-- due to a bug in the packaging of Ivy, some repackaging is needed
(IVY-828,IVY-802) --
target name=install-ivy
-get
src=http://apache.org/dist/ant/ivy/2.0.0-rc1/apache-ivy-2.0.0-rc1-bin.zip;
usetimestamp=true dest=apache-ivy-2.0.0-rc1-bin.zip /
+get
src=http://apache.org/dist/ant/ivy/${ivy.version}/apache-ivy-${ivy.version}-bin.zip;
usetimestamp=true dest=apache-ivy-${ivy.version}-bin.zip /
mkdir dir=work-ivy /
-unzip overwrite=true src=apache-ivy-2.0.0-rc1-bin.zip
dest=ivy-work /
-copy file=ivy-work/apache-ivy-2.0.0-rc1/ivy-2.0.0-rc1.jar
tofile=${baseLocation}/plugins/org.apache.ivy_2.0.0.rc1.jar /
+unzip overwrite=true src=apache-ivy-${ivy.version}-bin.zip
dest=ivy-work /
+copy file=ivy-work/apache-ivy-${ivy.version}/ivy-${ivy.version}.jar
tofile=${baseLocation}/plugins/org.apache.ivy_${ivy.version}.jar /
delete dir=work-ivy /
/target
svn commit: r697208 - /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
Author: hibou Date: Fri Sep 19 12:37:07 2008 New Revision: 697208 URL: http://svn.apache.org/viewvc?rev=697208view=rev Log: IVYDE-90: add it to the change log Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=697208r1=697207r2=697208view=diff == --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Fri Sep 19 12:37:07 2008 @@ -13,6 +13,7 @@ - IMPROVE: Make the classpath entries order configuration UI more intuitive (IVYDE-104) - IMPROVE: Retrieve after resolve feature does not clean target directory first (IVYDE-105) +- FIX: IvyDE does not do property value expansion (IVYDE-90) - FIX: Resolve in workspace does not pick up all projects in workspace (IVYDE-118) (thanks to Matt Goldspink) - FIX: Ivy editor: code completion missing for matcher attribute of conflicts manager (IVYDE-99) - FIX: The project dependencies and the errors markers are conflicting (IVYDE-116)
[jira] Commented: (IVYDE-90) IvyDE does not do property value expansion
[
https://issues.apache.org/jira/browse/IVYDE-90?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=12632791#action_12632791
]
Will Gorman commented on IVYDE-90:
--
Hi Nicolas, should I create another case for the scenario where the properties
are coming from ant vs. an ivysettings file? In our scenario, we parameterize
from ant build.properties files which aren't explicitly referenced in the
ivysettings.xml.
Thanks!
Will
IvyDE does not do property value expansion
--
Key: IVYDE-90
URL: https://issues.apache.org/jira/browse/IVYDE-90
Project: IvyDE
Issue Type: Bug
Components: classpath container
Affects Versions: 2.0.0.alpha1
Environment: Eclipse 3.3.1
MyEclipse 6.0.1
Aptana 1.1.6
Ivy/IvyDE plugins from xoocode
Reporter: Michael Laccetti
Assignee: Nicolas Lalevée
Fix For: 2.0
Attachments: IVYDE-90_patch.zip
If I create an Ivy properties file with the variables defined in them, and
then reference those variables in the built script, Ivy via Ant will pick
them up, and inject the correct information. However, the same does not go
for IvyDE; it conks out trying to retrieve
something-something-${lala}.ext
Sample ivy.roperties
{noformat}
spring.version=2.5.3
{noformat}
Sample ivysettings.xml
{code:xml}
ivysettings
properties file=ivy.properties /
/ivysettings
{code}
Sample ivy.xml
{code:xml}
ivy-module version=2.0
info organisation=com.cryptologic module=OCL /
dependencies
!-- Spring Dependencies --
dependency org=org.springframework name=spring-core
rev=${spring.version} /
/dependencies
/ivy-module
{code}
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
