ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
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 GMT
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=file%3A%2F%2F.%2Fivysettings.xml&amp;acceptedTypes=jar&amp;sourceTypes=source&amp;javadocTypes=javadoc&amp;sourceSuffixes=-source%2C-sources%2C-src&amp;javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&amp;doRetrieve=false&amp;retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&amp;alphaOrder=false"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ivydetest-branch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<target name="default">
+		<path id="antlib.classpath">
+			<!--fileset dir="/home/nicolasl/dev/platform/svn/platform/tools/build/lib" includes="*.jar"
/-->
+			<fileset dir="/home/nicolasl/tools/eclipse-3.4/plugins" includes="org.apache.ivy_*.jar"
/>
+		</path>
+		<taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpathref="antlib.classpath"
loaderref="antlib.classpath.loader" />
+		<ivy:configure file="ivysettings.xml" />
+		<ivy:resolve conf="*" type="*" />
+	</target>
+
+</project>

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 @@
+<!--
+   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.    
+-->
+<ivy-module version="1.0">
+    <info organisation="org.apache.ivyde" module="ivytest-branch">
+        <description>
+            Project using some settings aware of some branches
+        </description>
+    </info>
+    <configurations>
+        <conf name="default" />
+    </configurations>
+    <dependencies>
+        <dependency org="myorg" name="mymodule" rev="1.2" conf="default" />
+    </dependencies>
+</ivy-module>

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 @@
+<ivysettings>
+    <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo" useOrigin="false"
/>
+    <settings defaultResolver="fakerepo" checkUpToDate="false" defaultBranch="trunk" />
+    <resolvers>
+        <filesystem name="fakerepo">
+            <ivy pattern="${ivy.settings.dir}/../fakerepo-branch/[organisation]/[module]/[branch]/[revision]/ivy.xml"/>
+            <artifact pattern="${ivy.settings.dir}/../fakerepo-branch/[organisation]/[module]/[branch]/[revision]/[type]s/[artifact].[ext]"/>
+        </filesystem>
+    </resolvers>
+</ivysettings>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.0">
+	<info organisation="myorg"
+		module="mymodule"
+                branch="trunk"
+		revision="1.2"
+		status="release"
+		publication="20080811152510"
+		default="true"
+	/>
+	<configurations>
+		<conf name="default" visibility="public"/>
+	</configurations>
+	<publications>
+		<artifact name="mymodule" type="jar" ext="jar" conf="default"/>
+	</publications>
+</ivy-module>

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)



Mime
View raw message