You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/09 10:49:17 UTC

svn commit: r405346 - in /maven/plugins/trunk/maven-idea-plugin/src: main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java

Author: brett
Date: Tue May  9 01:49:15 2006
New Revision: 405346

URL: http://svn.apache.org/viewcvs?rev=405346&view=rev
Log:
[MIDEA-49] fix issue where it was configured to jar and copy to WEB-INF classes - now it jars and copies to a lib
Submitted by: Manfred Geiler

Modified:
    maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
    maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java

Modified: maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java?rev=405346&r1=405345&r2=405346&view=diff
==============================================================================
--- maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaModuleMojo.java Tue May  9 01:49:15 2006
@@ -701,7 +701,8 @@
                 methodAttribute.addAttribute( "value", "5" );
                 Element uriAttribute = createElement( containerElement, "attribute" );
                 uriAttribute.addAttribute( "name", "URI" );
-                uriAttribute.addAttribute( "value", "/WEB-INF/classes" );
+                uriAttribute.addAttribute( "value", "/WEB-INF/lib/" + artifact.getArtifactId() + "-" +
+                    artifact.getVersion() + ".jar" );
             }
             else if ( artifact.getFile() != null )
             {

Modified: maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java?rev=405346&r1=405345&r2=405346&view=diff
==============================================================================
--- maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java (original)
+++ maven/plugins/trunk/maven-idea-plugin/src/test/java/org/apache/maven/plugin/idea/IdeaModuleTest.java Tue May  9 01:49:15 2006
@@ -427,7 +427,8 @@
                 assertEquals( "Test Library module method", "5", method.attributeValue( "value" ) );
 
                 Element uri = findElementByNameAttribute( containerElement, "attribute", "URI" );
-                assertEquals( "Test Library module method", "/WEB-INF/classes", uri.attributeValue( "value" ) );
+                assertEquals( "Test Library module method", "/WEB-INF/lib/" + name + "-1.0.jar",
+                              uri.attributeValue( "value" ) );
 
                 webModuleFound = true;
             }