felipeal 2004/12/08 19:15:36
Modified: ear plugin.jelly
Log:
better check for the case-sensitiveness issue
Revision Changes Path
1.32 +15 -10 maven-plugins/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plugin.jelly 9 Dec 2004 02:05:40 -0000 1.31
+++ plugin.jelly 9 Dec 2004 03:15:36 -0000 1.32
@@ -101,19 +101,24 @@
Check if there is no case-sensitive issues
-->
<util:file name="${lib.file.parent}/${lib.file.name}"
var="checkFile" />
- <j:if
test="${(!checkFile.getAbsolutePath().equals(checkFile.getCanonicalPath()))}">
+ <util:file name="${maven.repo.local}" var="checkRepoDir" />
+ <j:set var="repoPathSize"
value="${size(checkRepoDir.getCanonicalPath())}"/>
+ <j:set var="absolutePath"
value="${checkFile.getAbsolutePath().substring(repoPathSize)}"/>
+ <j:set var="canonicalPath"
value="${checkFile.getCanonicalPath().substring(repoPathSize)}"/>
+
+ <j:if test="${!absolutePath.equals(canonicalPath)}">
+ <!-- on some environments, the value of MAVEN_HOME might be
different thant the
+ cannonical path, which would make the above test to fail.
So, we just show
+ the warning if the repo -->
+ <util:file name="${maven.repo.local}" var="checkRepoDir" />
<ant:echo>
############################################################################
# WARNING: possible case-sensitiveness issue within a dependency #
############################################################################
-# One possibility is that the dependency was either retrieved in the past #
-# with the wrong case or has been specified with the wrong case in your #
-# project.xml file. If that is the case, fix your project.xml or update #
-# your local repository with the properly-cased file and try again. #
-# #
-# Another possibility is that your MAVEN_HOME is set with different cases #
-# than its canonical representation in your operating systems. If that's #
-# the case, you can ignore this message or correct the value of MAVEN_HOME #
+# Looks like a the dependency was either retrieved in the past with the #
+# wrong case or has been specified with the wrong case in your project.xml #
+# file. If that is the case, fix your project.xml or update your local #
+# repository with the properly-cased file and try again. #
# #
# Reason for the warning: #
# the dependency ${dep.id} is located at:
@@ -121,7 +126,7 @@
# but was expected to be located at:
'${checkFile.getCanonicalPath()}'
############################################################################
-</ant:echo>
+ </ant:echo>
</j:if>
<ear:setPath lib="${lib}" var="bundledPath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
