svn commit: r600186 - /incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl

[xavier]

Author: xavier
Date: Sat Dec  1 11:51:45 2007
New Revision: 600186

URL: http://svn.apache.org/viewvc?rev=600186&view=rev
Log:
FIX: bug with java 6 xslt engine 
FIX: badly overwritten change of URLs

Modified:
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl?rev=600186&r1=600185&r2=600186&view=diff
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl 
(original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/report/ivy-report.xsl 
Sat Dec  1 11:51:45 2007
@@ -46,12 +46,12 @@
     <xsl:param name="org" />
     <xsl:param name="mod" />
     <xsl:param name="rev" />
-    <xsl:if test="count($modules/revision/[EMAIL PROTECTED] and @name=$mod and 
@callerrev=$rev]) = 0">
+    <xsl:if test="count($modules/revision/caller[(@organisation=$org and 
@name=$mod) and @callerrev=$rev]) = 0">
     <table><tr><td>
     No dependency
     </td></tr></table>
     </xsl:if>
-    <xsl:if test="count($modules/revision/[EMAIL PROTECTED] and @name=$mod and 
@callerrev=$rev]) > 0">
+    <xsl:if test="count($modules/revision/caller[(@organisation=$org and 
@name=$mod) and @callerrev=$rev]) > 0">
     <table class="deps">
       <thead>
       <tr>
@@ -66,7 +66,7 @@
       </tr>
       </thead>
       <tbody>
-        <xsl:for-each select="$modules/revision/[EMAIL PROTECTED] and 
@name=$mod and @callerrev=$rev]">
+        <xsl:for-each select="$modules/revision/caller[(@organisation=$org and 
@name=$mod) and @callerrev=$rev]">
           <xsl:call-template name="called">
             <xsl:with-param name="callstack"     select="concat($org, 
string('/'), $mod)"/>
             <xsl:with-param name="indent"        select="string('')"/>
@@ -130,7 +130,7 @@
     </tr>
     <xsl:if test="not($revision/@evicted)">
     <xsl:if test="not(contains($callstack, concat($organisation, string('/'), 
$module)))">
-    <xsl:for-each select="$modules/revision/[EMAIL PROTECTED] and 
@name=$module and @callerrev=$rev]">
+    <xsl:for-each 
select="$modules/revision/caller[(@organisation=$organisation and 
@name=$module) and @callerrev=$rev]">
           <xsl:call-template name="called">
             <xsl:with-param name="callstack"     select="concat($callstack, 
string('#'), $organisation, string('/'), $module)"/>
             <xsl:with-param name="indent"        select="concat($indent, 
string('---'))"/>
@@ -161,21 +161,21 @@
 <xsl:template name="icons">
     <xsl:param name="revision"/>
     <xsl:if test="$revision/@searched = 'true'">
-         <img src="http://ivy.jayasoft.org/images/searched.gif"; alt="searched" 
title="required a search in repository"/>
+         <img src="http://ant.apache.org/ivy/images/searched.gif"; 
alt="searched" title="required a search in repository"/>
     </xsl:if>
     <xsl:if test="$revision/@downloaded = 'true'">
-         <img src="http://ivy.jayasoft.org/images/downloaded.gif"; 
alt="downloaded" title="downloaded from repository"/>
+         <img src="http://ant.apache.org/ivy/images/downloaded.gif"; 
alt="downloaded" title="downloaded from repository"/>
     </xsl:if>
     <xsl:if test="$revision/@evicted">
         <xsl:element name="img">
-            <xsl:attribute 
name="src">http://ivy.jayasoft.org/images/evicted.gif</xsl:attribute>
+            <xsl:attribute 
name="src">http://ant.apache.org/ivy/images/evicted.gif</xsl:attribute>
             <xsl:attribute name="alt">evicted</xsl:attribute>
             <xsl:attribute name="title">evicted by <xsl:for-each 
select="$revision/evicted-by"><xsl:value-of select="@rev"/> 
</xsl:for-each></xsl:attribute>
         </xsl:element>
     </xsl:if>
     <xsl:if test="$revision/@error">
         <xsl:element name="img">
-            <xsl:attribute 
name="src">http://ivy.jayasoft.org/images/error.gif</xsl:attribute>
+            <xsl:attribute 
name="src">http://ant.apache.org/ivy/images/error.gif</xsl:attribute>
             <xsl:attribute name="alt">error</xsl:attribute>
             <xsl:attribute name="title">error: <xsl:value-of 
select="$revision/@error"/></xsl:attribute>
         </xsl:element>
@@ -260,7 +260,7 @@
     <link rel="stylesheet" type="text/css" href="ivy-report.css" /> 
   </head>
   <body>
-    <div id="logo"><a href="http://ivy.jayasoft.org/";><img 
src="http://ivy.jayasoft.org/logo.png"/></a></div>
+    <div id="logo"><a href="http://ant.apache.org/ivy/";><img 
src="http://ant.apache.org/ivy/logo.png"/></a></div>
     <h1>
       <xsl:element name="a">
         <xsl:attribute name="name"><xsl:value-of 
select="info/@organisation"/>-<xsl:value-of 
select="info/@module"/></xsl:attribute>
@@ -290,10 +290,10 @@
         <table class="header">
           <tr><td class="title">Modules</td><td class="value"><xsl:value-of 
select="count($modules)"/></td></tr>
           <tr><td class="title">Revisions</td><td class="value"><xsl:value-of 
select="count($revisions)"/>  
-            (<xsl:value-of select="count($searcheds)"/> searched <img 
src="http://ivy.jayasoft.org/images/searched.gif"; alt="searched" title="module 
revisions which required a search with a dependency resolver to be resolved"/>,
-            <xsl:value-of select="count($downloadeds)"/> downloaded <img 
src="http://ivy.jayasoft.org/images/downloaded.gif"; alt="downloaded" 
title="module revisions for which ivy file was downloaded by dependency 
resolver"/>,
-            <xsl:value-of select="count($evicteds)"/> evicted <img 
src="http://ivy.jayasoft.org/images/evicted.gif"; alt="evicted" title="module 
revisions which were evicted by others"/>,
-            <xsl:value-of select="count($errors)"/> errors <img 
src="http://ivy.jayasoft.org/images/error.gif"; alt="error" title="module 
revisions on which error occured"/>)</td></tr>
+            (<xsl:value-of select="count($searcheds)"/> searched <img 
src="http://ant.apache.org/ivy/images/searched.gif"; alt="searched" 
title="module revisions which required a search with a dependency resolver to 
be resolved"/>,
+            <xsl:value-of select="count($downloadeds)"/> downloaded <img 
src="http://ant.apache.org/ivy/images/downloaded.gif"; alt="downloaded" 
title="module revisions for which ivy file was downloaded by dependency 
resolver"/>,
+            <xsl:value-of select="count($evicteds)"/> evicted <img 
src="http://ant.apache.org/ivy/images/evicted.gif"; alt="evicted" title="module 
revisions which were evicted by others"/>,
+            <xsl:value-of select="count($errors)"/> errors <img 
src="http://ant.apache.org/ivy/images/error.gif"; alt="error" title="module 
revisions on which error occured"/>)</td></tr>
           <tr><td class="title">Artifacts</td><td class="value"><xsl:value-of 
select="count($artifacts)"/> 
             (<xsl:value-of select="count($dlartifacts)"/> downloaded,
             <xsl:value-of select="count($faileds)"/> failed)</td></tr>