[Nice-commit] Nice/src/nice/tools/maven plugin.jelly,1.1,1.2
Brought to you by:
bonniot
From: Daniel B. <bo...@us...> - 2004-06-09 14:44:16
|
Update of /cvsroot/nice/Nice/src/nice/tools/maven In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23986 Modified Files: plugin.jelly Log Message: Cleanup. Do not use replaceAll, as that fails on JDK 1.3. Index: plugin.jelly =================================================================== RCS file: /cvsroot/nice/Nice/src/nice/tools/maven/plugin.jelly,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.jelly 14 Feb 2004 21:07:09 -0000 1.1 --- plugin.jelly 9 Jun 2004 14:44:05 -0000 1.2 *************** *** 16,20 **** <!-- Give a warning if sources were not found, to let the user know ! what's (not) happening. --> <nice:ifNotNeeded> --- 16,20 ---- <!-- Give a warning if sources were not found, to let the user know ! what's (not) happening. --> <nice:ifNotNeeded> *************** *** 150,154 **** <goal name="nice:jar-resources" description="Copy any resources that must be present in the deployed JAR file"> ! <j:if test="${!pom.build.resources.isEmpty()}"> <maven:copy-resources --- 150,154 ---- <goal name="nice:jar-resources" description="Copy any resources that must be present in the deployed JAR file"> ! <j:if test="${!pom.build.resources.isEmpty()}"> <maven:copy-resources *************** *** 157,161 **** </j:if> </goal> ! <define:taglib uri="nice"> <define:tag name="dependency-handle"> --- 157,161 ---- </j:if> </goal> ! <define:taglib uri="nice"> <define:tag name="dependency-handle"> *************** *** 212,217 **** --> ! <j:set var="mainPkgDir" ! value="${pom.build.sourceDirectory}/${pom.package.replaceAll('\.', '/')}"/> <util:available file="${mainPkgDir}"> --- 212,219 ---- --> ! <j:set var="mainPkgDir" value="${pom.package}" /> ! <util:replace var="mainPkgDir" ! oldChar="." newChar="/" value="${mainPkgDir}" /> ! <j:set var="mainPkgDir" value="${pom.build.sourceDirectory}/${mainPkgDir}"/> <util:available file="${mainPkgDir}"> |