Author: fgiust
Date: Mon Oct  9 14:05:10 2006
New Revision: 454513

URL: http://svn.apache.org/viewvc?view=rev&rev=454513
Log:
MECLIPSE-155 Stop assuming J2EE 1.3 (ear projects)

Modified:
    
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java?view=diff&rev=454513&r1=454512&r2=454513
==============================================================================
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
 Mon Oct  9 14:05:10 2006
@@ -4,8 +4,10 @@
 package org.apache.maven.plugin.eclipse.writers;
 
 import java.io.File;
+import java.util.Iterator;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.Messages;
 import org.apache.maven.plugin.ide.IdeDependency;
@@ -244,9 +246,19 @@
 
     protected String resolveJ2eeVersion()
     {
-        String version = null;
-        // @todo this is the default, find real j2ee version from dependencies
-        return version == null ? "1.3" : version; //$NON-NLS-1$
+        // Take a guess as to what version of J2EE they're using; assume 1.3
+        // See: 
http://maven.apache.org/guides/mini/guide-coping-with-sun-jars.html
+        String version = "1.3";
+        for ( Iterator it = config.getProject().getDependencies().iterator(); 
it.hasNext(); )
+        {
+            Dependency d = (Dependency) it.next();
+            if ( "javax.j2ee".equals( d.getGroupId() ) && "j2ee".equals( 
d.getArtifactId() ) )
+            {
+                version = d.getVersion();
+                break;
+            }
+        }
+        return version;
     }
 
     protected String resolveJavaVersion()


Reply via email to