svn commit: r750397 - in /ant/ivy/ivyde/trunk/test: fakerepo/myorg/helloworld/ivy-1.1.xml javadocs/.classpath javadocs/ivy.xml

[hibou]

Author: hibou
Date: Thu Mar  5 09:22:02 2009
New Revision: 750397

URL: http://svn.apache.org/viewvc?rev=750397&view=rev
Log:
IVYDE-166:
 - try to reproduce the bug more closely

Modified:
    ant/ivy/ivyde/trunk/test/fakerepo/myorg/helloworld/ivy-1.1.xml
    ant/ivy/ivyde/trunk/test/javadocs/.classpath
    ant/ivy/ivyde/trunk/test/javadocs/ivy.xml

Modified: ant/ivy/ivyde/trunk/test/fakerepo/myorg/helloworld/ivy-1.1.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/helloworld/ivy-1.1.xml?rev=750397&r1=750396&r2=750397&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/fakerepo/myorg/helloworld/ivy-1.1.xml (original)
+++ ant/ivy/ivyde/trunk/test/fakerepo/myorg/helloworld/ivy-1.1.xml Thu Mar  5 
09:22:02 2009
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="1.4">
-       <info organisation="myorg"
-               module="helloworld"
-               revision="1.1"
-               status="release"
-               publication="20080811152510"
-               default="true"
-       />
-       <configurations>
-<conf name="default"/>
-<conf name="ide" extends="default" description="+ Javadocs and sources"/>
-       </configurations>
-       <publications>
-               <artifact name="helloworld"     type="jar"     ext="jar" 
conf="default"/>
-        <artifact name="helloworld-doc" type="javadoc" ext="zip" conf="ide"/>
-       </publications>
+    <info organisation="myorg" module="helloworld" revision="1.1" 
status="release" publication="20080811152510" />
+    <configurations>
+        <conf name="default" />
+        <conf name="ide" extends="default" description="+ Javadocs and 
sources" />
+    </configurations>
+    <publications>
+        <artifact name="helloworld" type="jar" ext="jar" conf="default" />
+        <artifact name="helloworld-doc" type="javadoc" ext="zip" conf="ide" />
+    </publications>
 </ivy-module>

Modified: ant/ivy/ivyde/trunk/test/javadocs/.classpath
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/javadocs/.classpath?rev=750397&r1=750396&r2=750397&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/javadocs/.classpath (original)
+++ ant/ivy/ivyde/trunk/test/javadocs/.classpath Thu Mar  5 09:22:02 2009
@@ -2,6 +2,6 @@
 <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;loadSettingsOnDemand=false&amp;propertyFiles="/>
+       <classpathentry kind="con" 
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=ide&amp;ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ant/ivy/ivyde/trunk/test/javadocs/ivy.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/javadocs/ivy.xml?rev=750397&r1=750396&r2=750397&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/javadocs/ivy.xml (original)
+++ ant/ivy/ivyde/trunk/test/javadocs/ivy.xml Thu Mar  5 09:22:02 2009
@@ -22,10 +22,12 @@
             Test the attachement of javadoc
         </description>
     </info>
-    <configurations>
-        <conf name="default" />
+    <configurations defaultconf="compile,war->default;ide->ide(default)">
+        <conf name="compile" />
+        <conf name="war" /> <!-- Artifacts to be included in a WAR -->
+        <conf name="ide" extends="compile" description="+ Javadocs and 
sources" />
     </configurations>
     <dependencies>
-        <dependency org="myorg" name="helloworld" rev="1.1" 
conf="default->ide" />
+        <dependency org="myorg" name="helloworld" rev="1.1" />
     </dependencies>
 </ivy-module>