[jira] Assigned: (IVY-727) ivy:install task missing branch attribute
[ https://issues.apache.org/jira/browse/IVY-727?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Xavier Hanin reassigned IVY-727: Assignee: Xavier Hanin ivy:install task missing branch attribute - Key: IVY-727 URL: https://issues.apache.org/jira/browse/IVY-727 Project: Ivy Issue Type: Improvement Components: Ant Reporter: Shawn Castrianni Assignee: Xavier Hanin ivy:install task missing branch attribute -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.
svn commit: r632587 - in /ant/ivy/core/trunk: CHANGES.txt doc/use/install.html src/java/org/apache/ivy/ant/IvyInstall.java test/java/org/apache/ivy/ant/IvyInstallTest.java test/repositories/branches/i
Author: xavier
Date: Sat Mar 1 05:01:45 2008
New Revision: 632587
URL: http://svn.apache.org/viewvc?rev=632587view=rev
Log:
IMPROVEMENT: add branch attribute in ivy:install task (IVY-727)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/doc/use/install.html
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
ant/ivy/core/trunk/test/repositories/branches/ivysettings.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=632587r1=632586r2=632587view=diff
==
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sat Mar 1 05:01:45 2008
@@ -65,6 +65,7 @@
trunk version
=
- IMPROVEMENT: Make Ivy standalone runnable with no required dependencies
(IVY-757)
+- IMPROVEMENT: add branch attribute in ivy:install task (IVY-727)
- FIX: XML schema ambiguity (IVY-750)
- FIX: ivy-resolve fails when a project has different dependencies in
different branches (IVY-717)
Modified: ant/ivy/core/trunk/doc/use/install.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/install.html?rev=632587r1=632586r2=632587view=diff
==
--- ant/ivy/core/trunk/doc/use/install.html (original)
+++ ant/ivy/core/trunk/doc/use/install.html Sat Mar 1 05:01:45 2008
@@ -46,6 +46,8 @@
tdYes/td/tr
trtdmodule/tdtdthe name of the module to install/td
tdYes/td/tr
+trtdbranch/tdtdthe branch of the module to install span
class=sincesince 2.0/span/td
+tdNo, defaults to default branch with exact matcher, '*' with any
other matcher/td/tr
trtdrevision/tdtdthe revision of the module to install/td
tdYes/td/tr
trtdvalidate/tdtdtrue to force ivy files validation against
ivy.xsd, false to force no validation/td
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java?rev=632587r1=632586r2=632587view=diff
==
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java Sat Mar 1
05:01:45 2008
@@ -20,6 +20,7 @@
import java.io.File;
import org.apache.ivy.Ivy;
+import org.apache.ivy.core.module.id.ModuleId;
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.report.ResolveReport;
import org.apache.ivy.core.settings.IvySettings;
@@ -37,6 +38,8 @@
private String revision;
+private String branch;
+
private boolean overwrite = false;
private String from;
@@ -76,6 +79,11 @@
} else if (revision == null !PatternMatcher.EXACT.equals(matcher)) {
revision = PatternMatcher.ANY_EXPRESSION;
}
+ if (branch == null PatternMatcher.EXACT.equals(matcher)) {
+ branch =
settings.getDefaultBranch(ModuleId.newInstance(organisation, module));
+ } else if (branch == null !PatternMatcher.EXACT.equals(matcher)) {
+ branch = PatternMatcher.ANY_EXPRESSION;
+ }
if (from == null) {
throw new BuildException(
no from resolver name: please provide it through
parameter 'from');
@@ -84,7 +92,9 @@
throw new BuildException(
no to resolver name: please provide it through parameter
'to');
}
-ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation,
module, revision);
+ModuleRevisionId mrid =
+ModuleRevisionId.newInstance(organisation, module, branch,
revision);
+
ResolveReport report;
try {
report = ivy.install(mrid, from, to, transitive,
doValidate(settings), overwrite,
@@ -118,6 +128,14 @@
public void setModule(String module) {
this.module = module;
}
+
+ public String getBranch() {
+ return branch;
+ }
+
+ public void setBranch(String branch) {
+ this.branch = branch;
+ }
public String getOrganisation() {
return organisation;
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java?rev=632587r1=632586r2=632587view=diff
==
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java Sat Mar
1 05:01:45 2008
@@ -21,9 +21,9 @@
import junit.framework.TestCase;
+import org.apache.ivy.util.FileUtil;
import
[EMAIL PROTECTED]: Project dotnet-antlib-test (in module ant-antlibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project dotnet-antlib-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 64 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - dotnet-antlib-test : Task and Type Libraries for Apache Ant Full details are available at: http://vmgump.apache.org/gump/public/ant-antlibs/dotnet-antlib-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/ant-antlibs/dotnet-antlib-test/gump_work/build_ant-antlibs_dotnet-antlib-test.html Work Name: build_ant-antlibs_dotnet-antlib-test (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 1 sec Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dant-testutil.jar=/srv/gump/public/workspace/ant/build/lib/ant-testutil.jar test [Working Directory: /srv/gump/public/workspace/ant-antlibs/dotnet] CLASSPATH: /usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/ant-antlibs/dotnet/build/test-classes:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-01032008.jar:/srv/gump/public/workspace/ant-antlibs/dotnet/build/ant-dotnet-01032008.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar - [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 8.359 sec [au:antunit] Target: test-passing took 8.311 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/dir with spaces/wsdl-test.xml [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 3.599 sec [au:antunit] Target: testWSDL took 3.558 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/dotnetexec-test.xml [au:antunit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 2.096 sec [au:antunit] Target: testCSC took 2.07 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/nunit/nunit-test.xml [au:antunit] Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 0.213 sec [au:antunit] Target: test-passing took 0.009 sec [au:antunit] Target: test-failing took 0.002 sec [au:antunit] Target: test-failing-errorproperty took 0.111 sec [au:antunit] Target: test-failing-with-fail took 0.004 sec [au:antunit] Target: test-no-assembly took 0.01 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/old-core-test.xml [au:antunit] Tests run: 9, Failures: 0, Errors: 0, Time elapsed: 5.954 sec [au:antunit] Target: testCSCintrinsicFileset took 0.808 sec [au:antunit] Target: testCSCresponseFile took 0.768 sec [au:antunit] Target: testILASM took 0.702 sec [au:antunit] Target: testCSCdll took 0.612 sec [au:antunit] Target: testILDASM took 0.725 sec [au:antunit] Target: testILDASM_empty took 0.114 sec [au:antunit] Target: testJsharp took 0.018 sec [au:antunit] Target: testCSCResources took 1.239 sec [au:antunit] Target: testCSC took 0.781 sec [au:antunit] Build File: /srv/gump/public/workspace/ant-antlibs/dotnet/src/tests/antunit/wsdl2dotnet-test.xml [au:antunit] Tests run: 15, Failures: 0, Errors: 0, Time elapsed: 4.69 sec [au:antunit] Target: testSchemaMustBeSet took 0.027 sec [au:antunit] Target: testLocalWsdlVB took 0.1 sec [au:antunit] Target: testInvalidExtraOps took 0.013 sec [au:antunit] Target: testSrcIsMissing took 0.017 sec [au:antunit] Target: testNoParams took 0.023 sec [au:antunit] Target: testBothSrc took 0.011 sec [au:antunit] Target: testSchemaFileMustHaveOneOptionOnly took 0.012 sec [au:antunit] Target: testLocalWsdl took 1.497 sec [au:antunit] Target: testSrcIsDir took 0.025 sec [au:antunit] Target: testLocalWsdlServerVB took 0.019 sec [au:antunit] Target: testLocalWsdlServer took 2.521 sec [au:antunit] Target: testNoSrc took 0.013 sec [au:antunit] Target:
[EMAIL PROTECTED]: Project test-ant (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 64 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant : Java based build tool Full details are available at: http://vmgump.apache.org/gump/public/ant/test-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/ant/test-ant/gump_work/build_ant_test-ant.html Work Name: build_ant_test-ant (Type: Build) Work ended in a state of : Failed Elapsed: 11 mins 29 secs Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/srv/gump/public/workspace/xml-xalan/build/serializer.jar:/srv/gump/public/workspace/xml-xalan/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/srv/gump/public/workspace/ant/dist run-tests [Working Directory: /srv/gump/public/workspace/ant] CLASSPATH: /usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/ant/build/testcases:/srv/gump/public/workspace/ant/src/tests/junit:/srv/gump/public/workspace/ant/src/etc/testcases:/srv/gump/public/workspace/ant/build/lib/ant-stylebook.jar:/srv/gump/public/workspace/ant/build/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/build/lib/ant-swing.jar:/srv/gump/public/workspace/ant/build/lib/ant-junit.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/build/lib/ant-javamail.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bcel.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-regexp.jar:/srv/gump/public/workspace/ant/build/lib/ant-trax.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-net.jar:/srv/gump/public/workspace/ant/build/lib/ant-jsch.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-log4j.jar:/srv/gump/public/workspace/ant/build/lib/ant-antlr.jar:/srv/gump/public/workspace/ant/build/li b/ant-commons-logging.jar:/srv/gump/public/workspace/ant/build/lib/ant-jdepend.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bsf.jar:/srv/gump/public/workspace/ant/build/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/build/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-oro.jar:/srv/gump/public/workspace/ant/build/lib/ant.jar:/srv/gump/public/workspace/ant/build/lib/ant-jai.jar:/srv/gump/packages/antlr-2.7.6/antlr.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-01032008.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-01032008.jar:/srv/gump/public/workspace/apache-commons/net/dist/commons-net-01032008.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/public/workspace/jakarta-bcel/target/bcel-5.3-SNAPSHOT.jar:/srv/gump/public/workspace/jakarta-bsf/build/lib/bsf.jar:/srv/gump/public/workspace/logging-log4j-12/dist/lib/log4j-01032008.jar:/srv/gump/public/workspace/jakarta- oro/jakarta-oro-01032008.jar:/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-01032008.jar:/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jdepend-2.6/lib/jdepend.jar:/srv/gump/packages/jsch/jsch-0.1.28.jar:/srv/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-01032008.jar:/srv/gump/public/workspace/junit/dist/junit-01032008.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-compiler.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-runtime.jar:/srv/gump/public/workspace/xml-commons/java/build/which.jar:/srv/gump/public/workspace/rhino/build/rhino_01032008/js.jar:/srv/gump/packages/bsh-2.0b4/bsh-commands-2.0b4.jar:/srv/gump/packages/bsh- 2.0b4/bsh-classpath-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-core-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-bsf-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-reflect-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-util-2.0b4.jar:/srv/gump/public/workspace/apache-commons/codec/dist/commons-codec-01032008.jar -
[EMAIL PROTECTED]: Project test-ant-no-xerces (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant-no-xerces has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 64 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant-no-xerces : Java based build tool Full details are available at: http://vmgump.apache.org/gump/public/ant/test-ant-no-xerces/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/ant/test-ant-no-xerces/gump_work/build_ant_test-ant-no-xerces.html Work Name: build_ant_test-ant-no-xerces (Type: Build) Work ended in a state of : Failed Elapsed: 12 mins 16 secs Command Line: /usr/lib/jvm/java-1.5.0-sun/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/srv/gump/public/workspace/ant/dist run-tests [Working Directory: /srv/gump/public/workspace/ant] CLASSPATH: /usr/lib/jvm/java-1.5.0-sun/lib/tools.jar:/srv/gump/public/workspace/ant/build/testcases:/srv/gump/public/workspace/ant/src/tests/junit:/srv/gump/public/workspace/ant/src/etc/testcases:/srv/gump/public/workspace/ant/build/lib/ant-stylebook.jar:/srv/gump/public/workspace/ant/build/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/build/lib/ant-swing.jar:/srv/gump/public/workspace/ant/build/lib/ant-junit.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/build/lib/ant-javamail.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bcel.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-regexp.jar:/srv/gump/public/workspace/ant/build/lib/ant-trax.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-net.jar:/srv/gump/public/workspace/ant/build/lib/ant-jsch.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-log4j.jar:/srv/gump/public/workspace/ant/build/lib/ant-antlr.jar:/srv/gump/public/workspace/ant/build/li b/ant-commons-logging.jar:/srv/gump/public/workspace/ant/build/lib/ant-jdepend.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bsf.jar:/srv/gump/public/workspace/ant/build/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/build/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-oro.jar:/srv/gump/public/workspace/ant/build/lib/ant.jar:/srv/gump/public/workspace/ant/build/lib/ant-jai.jar:/srv/gump/packages/antlr-2.7.6/antlr.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-01032008.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-01032008.jar:/srv/gump/public/workspace/apache-commons/net/dist/commons-net-01032008.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/public/workspace/jakarta-bcel/target/bcel-5.3-SNAPSHOT.jar:/srv/gump/public/workspace/jakarta-bsf/build/lib/bsf.jar:/srv/gump/public/workspace/logging-log4j-12/dist/lib/log4j-01032008.jar:/srv/gump/public/workspace/jakarta- oro/jakarta-oro-01032008.jar:/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-01032008.jar:/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jdepend-2.6/lib/jdepend.jar:/srv/gump/packages/jsch/jsch-0.1.28.jar:/srv/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-01032008.jar:/srv/gump/public/workspace/junit/dist/junit-01032008.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-compiler.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-runtime.jar:/srv/gump/public/workspace/xml-commons/java/build/which.jar:/srv/gump/public/workspace/rhino/build/rhino_01032008/js.jar:/srv/gump/packages/bsh-2.0b4/bsh-commands-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-classpath-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-core-2.0b4.ja r:/srv/gump/packages/bsh-2.0b4/bsh-bsf-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-reflect-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-util-2.0b4.jar:/srv/gump/public/workspace/apache-commons/codec/dist/commons-codec-01032008.jar - at org.apache.tools.ant.Project.executeTargets(Project.java:1176) at org.apache.tools.ant.Main.runBuild(Main.java:758) at org.apache.tools.ant.Main.startAnt(Main.java:217) at org.apache.tools.ant.Main.start(Main.java:179) at
