You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by fe...@apache.org on 2005/01/17 02:43:28 UTC

svn commit: r125381 - /maven/maven-1/plugins/trunk/ear/plugin.jelly /maven/maven-1/plugins/trunk/ear/xdocs/changes.xml

Author: felipeal
Date: Sun Jan 16 17:43:25 2005
New Revision: 125381

URL: http://svn.apache.org/viewcvs?view=rev&rev=125381
Log:
MPEAR-37: undoing dependency check introduced by fixing MPEAR-9
Modified:
   maven/maven-1/plugins/trunk/ear/plugin.jelly
   maven/maven-1/plugins/trunk/ear/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/ear/plugin.jelly
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/plugin.jelly?view=diff&rev=125381&p1=maven/maven-1/plugins/trunk/ear/plugin.jelly&r1=125380&p2=maven/maven-1/plugins/trunk/ear/plugin.jelly&r2=125381
==============================================================================
--- maven/maven-1/plugins/trunk/ear/plugin.jelly	(original)
+++ maven/maven-1/plugins/trunk/ear/plugin.jelly	Sun Jan 16 17:43:25 2005
@@ -96,38 +96,6 @@
            We know that this dep "wants" to be bundled.
           -->
                     
-
-          <!-- 
-           Check if there is no case-sensitive issues
-          -->
-          <util:file name="${lib.file.parent}/${lib.file.name}" var="checkFile" />
-          <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 -->
-             <ant:echo>
-############################################################################
-#      WARNING: possible case-sensitiveness issue within a dependency      #
-############################################################################
-# Looks like a 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 (relatively to the local repo) at:
-'${absolutePath}'
-# but was expected to be located at:
-'${canonicalPath}'
-############################################################################
-            </ant:echo>
-          </j:if>
-
           <ear:setPath lib="${lib}" var="bundledPath"/>
           <echo>Dependency ${lib.file.name} will be bundled as ${bundledPath}</echo>
 

Modified: maven/maven-1/plugins/trunk/ear/xdocs/changes.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/xdocs/changes.xml?view=diff&rev=125381&p1=maven/maven-1/plugins/trunk/ear/xdocs/changes.xml&r1=125380&p2=maven/maven-1/plugins/trunk/ear/xdocs/changes.xml&r2=125381
==============================================================================
--- maven/maven-1/plugins/trunk/ear/xdocs/changes.xml	(original)
+++ maven/maven-1/plugins/trunk/ear/xdocs/changes.xml	Sun Jan 16 17:43:25 2005
@@ -25,6 +25,8 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="on CVS">
+      <action dev="felipeal" type="remove" issue="MPEAR-37">Removed checking introduced by MPEAR-9, as the fix introduced more bugs than it solved</code>.
+      </action>
       <action dev="dion" type="fix" issue="MPEAR-32">Re-added property <code>maven.ear.appxml</code>.
       </action>
     </release>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org