Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 79018 invoked from network); 5 Mar 2009 15:52:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Mar 2009 15:52:55 -0000 Received: (qmail 22825 invoked by uid 500); 5 Mar 2009 15:52:55 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 22754 invoked by uid 500); 5 Mar 2009 15:52:55 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 22745 invoked by uid 99); 5 Mar 2009 15:52:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 07:52:55 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2009 15:52:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B3D332388964; Thu, 5 Mar 2009 15:52:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r750478 - in /ant/ivy/ivyde/trunk: org.apache.ivyde.eclipse/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ test/branch/ test/branch/src/ test/fakerepo-branch/ test/fakerepo-branch/myorg/ test/fakerepo-branch/myorg/... Date: Thu, 05 Mar 2009 15:52:29 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090305155230.B3D332388964@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hibou Date: Thu Mar 5 15:52:27 2009 New Revision: 750478 URL: http://svn.apache.org/viewvc?rev=750478&view=rev Log: IVYDE-168: - add a test project to reproduce the bug - bug fixed by forcing the IvyContext to be in the thread local so Ivy can found the default branch Added: ant/ivy/ivyde/trunk/test/branch/ (with props) ant/ivy/ivyde/trunk/test/branch/.classpath ant/ivy/ivyde/trunk/test/branch/.project ant/ivy/ivyde/trunk/test/branch/build.xml (with props) ant/ivy/ivyde/trunk/test/branch/ivy.xml (with props) ant/ivy/ivyde/trunk/test/branch/ivysettings.xml (with props) ant/ivy/ivyde/trunk/test/branch/src/ ant/ivy/ivyde/trunk/test/fakerepo-branch/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml (with props) ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java 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=750478&r1=750477&r2=750478&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Thu Mar 5 15:52:27 2009 @@ -27,6 +27,7 @@ - FIX: REGRESSION: Resolving does no longer respect configurations (IVYDE-161) - FIX: Parsing ivy file fails in IvyDE while it succeeds in Ant (IVYDE-35) - FIX: Sources attach but Javadocs don't (IVYDE-166) +- FIX: Branch in repository pattern and defaultBranch (IVYDE-168) version 2.0.0 beta1 ========================== Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=750478&r1=750477&r2=750478&view=diff ============================================================================== --- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java (original) +++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java Thu Mar 5 15:52:27 2009 @@ -193,6 +193,8 @@ Thread.currentThread().setContextClassLoader(IvyResolveJob.class.getClassLoader()); try { this.ivy = conf.getIvy(); + // IVYDE-168 : Ivy needs the IvyContext in the threadlocal in order to found the default branch + ivy.pushContext(); this.md = conf.getModuleDescriptor(); } catch (IvyDEException e) { return new Status(IStatus.ERROR, IvyPlugin.ID, IStatus.ERROR, e.getMessage(), e); Propchange: ant/ivy/ivyde/trunk/test/branch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 5 15:52:27 2009 @@ -0,0 +1,2 @@ +bin + Added: ant/ivy/ivyde/trunk/test/branch/.classpath URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/branch/.classpath?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/branch/.classpath (added) +++ ant/ivy/ivyde/trunk/test/branch/.classpath Thu Mar 5 15:52:27 2009 @@ -0,0 +1,7 @@ + + + + + + + Added: ant/ivy/ivyde/trunk/test/branch/.project URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/branch/.project?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/branch/.project (added) +++ ant/ivy/ivyde/trunk/test/branch/.project Thu Mar 5 15:52:27 2009 @@ -0,0 +1,17 @@ + + + ivydetest-branch + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Added: ant/ivy/ivyde/trunk/test/branch/build.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/branch/build.xml?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/branch/build.xml (added) +++ ant/ivy/ivyde/trunk/test/branch/build.xml Thu Mar 5 15:52:27 2009 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + Propchange: ant/ivy/ivyde/trunk/test/branch/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/branch/build.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/branch/build.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/branch/ivy.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/branch/ivy.xml?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/branch/ivy.xml (added) +++ ant/ivy/ivyde/trunk/test/branch/ivy.xml Thu Mar 5 15:52:27 2009 @@ -0,0 +1,31 @@ + + + + + Project using some settings aware of some branches + + + + + + + + + Propchange: ant/ivy/ivyde/trunk/test/branch/ivy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/branch/ivy.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/branch/ivy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/branch/ivysettings.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/branch/ivysettings.xml?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/branch/ivysettings.xml (added) +++ ant/ivy/ivyde/trunk/test/branch/ivysettings.xml Thu Mar 5 15:52:27 2009 @@ -0,0 +1,10 @@ + + + + + + + + + + Propchange: ant/ivy/ivyde/trunk/test/branch/ivysettings.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/branch/ivysettings.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/branch/ivysettings.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml?rev=750478&view=auto ============================================================================== --- ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml (added) +++ ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml Thu Mar 5 15:52:27 2009 @@ -0,0 +1,17 @@ + + + + + + + + + + Propchange: ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author HeadURL Id Propchange: ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/ivy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo-branch/myorg/mymodule/trunk/1.2/jars/mymodule.jar?rev=750478&view=auto ============================================================================== (empty)