From 2113113361047c7ed882d10abbf930a1d16582fc Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 6 Dec 2005 01:06:58 +0000
Subject: [PATCH] Roll back last commit, just remove escapeText attribute

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@354250 13f79535-47bb-0310-9956-ffa450edef68
---
 plugin/plugin.jelly | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index d6808f13..285dd6a3 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -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>