svn commit: r354250 - /maven/maven-1/plugins/trunk/plugin/plugin.jelly

[lt...@apache.org]

Author: ltheussl
Date: Mon Dec  5 17:06:58 2005
New Revision: 354250

URL: http://svn.apache.org/viewcvs?rev=354250&view=rev
Log:
Roll back last commit, just remove escapeText attribute

Modified:
    maven/maven-1/plugins/trunk/plugin/plugin.jelly

Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=354250&r1=354249&r2=354250&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Mon Dec  5 17:06:58 2005
@@ -114,8 +114,6 @@
     <maven:param-check value="${minRelease}" fail="true" message="'minRelease' must be specified"/>
     <maven:param-check value="${neededBy}" fail="true" message="'neededBy' must be specified"/>
 
-    <j:useBean var="stringUtils" class="org.apache.commons.lang.StringUtils"/>
-
     <j:set var="pluginToTest" value="${artifactId}"/>
 
     <!-- Remove SNAPSHOT -->
@@ -154,8 +152,8 @@
             <!-- If not equals we use a more complex algorithm -->
 
             <!-- Tokenify -->
-            <j:set var="installedReleaseTokens" value="${stringUtils.split(installedRelease, '.')}"/>
-            <j:set var="minReleaseToHaveTokens" value="${stringUtils.split(minReleaseToHave, '.')}"/>
+            <u:tokenize var="installedReleaseTokens" delim=".">${installedRelease}</u:tokenize>
+            <u:tokenize var="minReleaseToHaveTokens" delim=".">${minReleaseToHave}</u:tokenize>
 
             <j:set var="minReleaseToHaveTokensIter" value="${minReleaseToHaveTokens.iterator()}"/>
 
@@ -173,7 +171,7 @@
               </j:invokeStatic>
               <j:choose>
                   <j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) lt 0}">
-                    <j:set var="errorSentence" value="Actually the plugin ${pluginToTest} v${installedRelease} is installed."/>
+                    <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} v${installedRelease} is installed."/>
                     <j:set var="testFailed" value="true"/>
                     <j:break/>
                   </j:when>
@@ -182,9 +180,9 @@
                   <j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) gt 0}">
                     <j:set var="testOk" value="true"/>
                     <j:break/>
-                  </j:when>              
+                  </j:when>
               </j:choose>
-            </j:forEach> 
+            </j:forEach>
           </j:when>
           <j:otherwise>
             <j:set var="testOk" value="true"/>
@@ -192,14 +190,14 @@
         </j:choose>
       </j:when>
       <j:otherwise>
-        <j:set var="errorSentence" value="Actually the plugin ${pluginToTest} isn't installed."/>
+        <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} isn't installed."/>
         <j:set var="testFailed" value="true"/>
       </j:otherwise>    
     </j:choose>
 
     <j:if test="${!testFailed and !testOk and minReleaseToHaveTokens.iterator().hasNext()}">
       <!-- A minor release is missing. For example : 1.10 < 1.10.2 -->
-      <j:set var="errorSentence" value="Actually the plugin ${pluginToTest} v${installedRelease} is installed."/>
+      <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} v${installedRelease} is installed."/>
       <j:set var="testFailed" value="true"/>    
     </j:if>