Author: aheritier
Date: Tue May 15 02:45:48 2007
New Revision: 538107
URL: http://svn.apache.org/viewvc?view=rev&rev=538107
Log:
move resolve* methods in JeeUtils.java
Deprecates the ones in IdeUtils.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpFacetsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.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=538107&r1=538106&r2=538107
==============================================================================
---
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
Tue May 15 02:45:48 2007
@@ -23,6 +23,7 @@
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.ide.IdeDependency;
import org.apache.maven.plugin.ide.IdeUtils;
+import org.apache.maven.plugin.ide.JeeUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.XMLWriter;
@@ -87,7 +88,7 @@
writer.startElement( ELT_VERSION );
- writer.writeText( IdeUtils.resolveServletVersion(project) );
+ writer.writeText( JeeUtils.resolveServletVersion(project) );
writer.endElement();
// use finalName as context root only if it has been explicitely
set
@@ -108,7 +109,7 @@
writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ejb" );
//$NON-NLS-1$
writer.startElement( ELT_VERSION );
- writer.writeText( IdeUtils.resolveEjbVersion(project) );
+ writer.writeText( JeeUtils.resolveEjbVersion(project) );
writer.endElement();
@@ -125,7 +126,7 @@
writer.addAttribute( ATTR_MODULE_TYPE_ID, "jst.ear" );
//$NON-NLS-1$
writer.startElement( ELT_VERSION );
- writer.writeText( IdeUtils.resolveJ2eeVersion(project) );
+ writer.writeText( JeeUtils.resolveJ2eeVersion(project) );
writer.endElement();
}
else
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpFacetsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpFacetsWriter.java?view=diff&rev=538107&r1=538106&r2=538107
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpFacetsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpFacetsWriter.java
Tue May 15 02:45:48 2007
@@ -27,6 +27,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.ide.IdeUtils;
+import org.apache.maven.plugin.ide.JeeUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
@@ -121,7 +122,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_WEB );
- writer.addAttribute( ATTR_VERSION,
IdeUtils.resolveServletVersion(config.getProject()) );
+ writer.addAttribute( ATTR_VERSION,
JeeUtils.resolveServletVersion(config.getProject()) );
writer.endElement(); // installed
}
else if ( "ejb".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
@@ -131,7 +132,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_EJB );
- writer.addAttribute( ATTR_VERSION,
IdeUtils.resolveEjbVersion(config.getProject()) );
+ writer.addAttribute( ATTR_VERSION,
JeeUtils.resolveEjbVersion(config.getProject()) );
writer.endElement(); // installed
}
else if ( "ear".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
@@ -141,7 +142,7 @@
writer.endElement(); // fixed
writer.startElement( ELT_INSTALLED );
writer.addAttribute( ATTR_FACET, FACET_JST_EAR );
- writer.addAttribute( ATTR_VERSION,
IdeUtils.resolveJ2eeVersion(config.getProject()) );
+ writer.addAttribute( ATTR_VERSION,
JeeUtils.resolveJ2eeVersion(config.getProject()) );
writer.endElement(); // installed
}
else if ( "jar".equalsIgnoreCase( packaging ) ) //$NON-NLS-1$
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?view=diff&rev=538107&r1=538106&r2=538107
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Tue May 15 02:45:48 2007
@@ -228,27 +228,20 @@
return resolvedArtifact;
}
+ /**
+ * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveEjbVersion(MavenProject)} instead
+ */
public static String resolveEjbVersion( MavenProject project )
{
- String version = findEjbVersionInDependencies( project );
-
- if ( version == null )
- {
- // No ejb dependency detected. Try to resolve the ejb
- // version from J2EE/JEE.
- JeeDescriptor descriptor =
- JeeUtils.getJeeDescriptorFromJeeVersion(
findJ2eeVersionInDependencies( project ) );
- if ( descriptor != null )
- version = descriptor.getEjbVersion();
- }
- return version == null ? JeeDescriptor.EJB_2_1 : version; //$NON-NLS-1$
+ return JeeUtils.resolveEjbVersion( project );
}
+ /**
+ * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveJ2eeVersion(MavenProject)} instead
+ */
public static String resolveJ2eeVersion( MavenProject project )
{
- String version = findJ2eeVersionInDependencies( project );
-
- return version == null ? JeeDescriptor.J2EE_1_4 : version;
//$NON-NLS-1$
+ return JeeUtils.resolveJ2eeVersion( project );
}
public static String resolveJavaVersion( MavenProject project )
@@ -275,20 +268,12 @@
return version == null ? IdeUtils.JAVA_1_4 : version; //$NON-NLS-1$
}
+ /**
+ * @deprecated Use [EMAIL PROTECTED]
JeeUtils#resolveServletVersion(MavenProject)} instead
+ */
public static String resolveServletVersion( MavenProject project )
{
- String version = findServletVersionInDependencies( project );
-
- if ( version == null )
- {
- // No servlet dependency detected. Try to resolve the servlet
- // version from J2EE/JEE.
- JeeDescriptor descriptor =
- JeeUtils.getJeeDescriptorFromJeeVersion(
findJ2eeVersionInDependencies( project ) );
- if ( descriptor != null )
- version = descriptor.getServletVersion();
- }
- return version == null ? JeeDescriptor.SERVLET_2_4 : version;
//$NON-NLS-1$
+ return JeeUtils.resolveServletVersion( project );
}
public static String toRelativeAndFixSeparator( File basedir, File
fileToAdd, boolean replaceSlashesWithDashes )
@@ -367,66 +352,6 @@
}
}
return value;
- }
-
- private static String findEjbVersionInDependencies( MavenProject project )
- {
- String[] artifactIds = new String[] { "ejb", "geronimo-spec-ejb" };
//$NON-NLS-1$
-
- String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
-
- // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
- if ( version == null )
- {
- if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-ejb_2.1_spec" }, project.getDependencies(), 3 ) != null )
- return JeeDescriptor.EJB_2_1;
- }
- if ( version == null )
- {
- if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-ejb_3.0_spec" }, project.getDependencies(), 3 ) != null )
- return JeeDescriptor.EJB_3_0;
- }
-
- return version;
- }
-
- private static String findJ2eeVersionInDependencies( MavenProject project )
- {
- String[] artifactIds = new String[] { "javaee-api", "j2ee",
"geronimo-spec-j2ee" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
-
- // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
- if ( version == null )
- {
- if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-j2ee_1.4_spec" }, project.getDependencies(), 3 ) != null )
- return JeeDescriptor.J2EE_1_4;
- }
-
- return version;
- }
-
- private static String findServletVersionInDependencies( MavenProject
project )
- {
- String[] artifactIds = new String[] { "servlet-api", "servletapi",
"geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
-
- // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
- if ( version == null )
- {
- if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-servlet_2.4_spec" },
- project.getDependencies(), 3 )
!= null )
- return JeeDescriptor.SERVLET_2_4;
- }
- if ( version == null )
- {
- if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-servlet_2.5_spec" },
- project.getDependencies(), 3 )
!= null )
- return JeeDescriptor.SERVLET_2_5;
- }
-
- return version;
}
private static String getProjectName( String artifactId, String version,
boolean addVersionToProjectName )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java?view=diff&rev=538107&r1=538106&r2=538107
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/JeeUtils.java
Tue May 15 02:45:48 2007
@@ -18,19 +18,21 @@
*/
package org.apache.maven.plugin.ide;
+import org.apache.maven.project.MavenProject;
+
import java.util.HashMap;
import java.util.Map;
public class JeeUtils
{
- private static final Map jeeMap = new HashMap();
-
private static final Map ejbMap = new HashMap();
- private static final Map servletMap = new HashMap();
+ private static final Map jeeMap = new HashMap();
private static final Map jspMap = new HashMap();
+ private static final Map servletMap = new HashMap();
+
static
{
addJEE( JeeDescriptor.J2EE_5_0, JeeDescriptor.EJB_3_0,
JeeDescriptor.SERVLET_2_5, JeeDescriptor.JSP_2_1 );
@@ -40,13 +42,12 @@
}
- private static void addJEE( String jeeVersion, String ejbVersion, String
servletVersion, String jspVersion )
+ public final static JeeDescriptor getJeeDescriptorFromEjbVersion( String
ejbVersion )
{
- JeeDescriptor descriptor = new JeeDescriptor( jeeVersion, ejbVersion,
servletVersion, jspVersion );
- jeeMap.put( jeeVersion, descriptor );
- ejbMap.put( ejbVersion, descriptor );
- servletMap.put( servletVersion, descriptor );
- jspMap.put( jspVersion, descriptor );
+ if ( ejbMap.containsKey( ejbVersion ) )
+ return (JeeDescriptor) ejbMap.get( ejbVersion );
+ else
+ return null;
}
public final static JeeDescriptor getJeeDescriptorFromJeeVersion( String
jeeVersion )
@@ -57,10 +58,10 @@
return null;
}
- public final static JeeDescriptor getJeeDescriptorFromEjbVersion( String
ejbVersion )
+ public final static JeeDescriptor getJeeDescriptorFromJspVersion( String
jspVersion )
{
- if ( ejbMap.containsKey( ejbVersion ) )
- return (JeeDescriptor) ejbMap.get( ejbVersion );
+ if ( jspMap.containsKey( jspVersion ) )
+ return (JeeDescriptor) jspMap.get( jspVersion );
else
return null;
}
@@ -73,12 +74,110 @@
return null;
}
- public final static JeeDescriptor getJeeDescriptorFromJspVersion( String
jspVersion )
+ public static String resolveEjbVersion( MavenProject project )
{
- if ( jspMap.containsKey( jspVersion ) )
- return (JeeDescriptor) jspMap.get( jspVersion );
- else
- return null;
+ String version = findEjbVersionInDependencies( project );
+
+ if ( version == null )
+ {
+ // No ejb dependency detected. Try to resolve the ejb
+ // version from J2EE/JEE.
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJ2eeVersionInDependencies( project ) );
+ if ( descriptor != null )
+ version = descriptor.getEjbVersion();
+ }
+ return version == null ? JeeDescriptor.EJB_2_1 : version; //$NON-NLS-1$
+ }
+
+ public static String resolveJ2eeVersion( MavenProject project )
+ {
+ String version = findJ2eeVersionInDependencies( project );
+
+ return version == null ? JeeDescriptor.J2EE_1_4 : version;
//$NON-NLS-1$
+ }
+
+ public static String resolveServletVersion( MavenProject project )
+ {
+ String version = findServletVersionInDependencies( project );
+
+ if ( version == null )
+ {
+ // No servlet dependency detected. Try to resolve the servlet
+ // version from J2EE/JEE.
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion(
findJ2eeVersionInDependencies( project ) );
+ if ( descriptor != null )
+ version = descriptor.getServletVersion();
+ }
+ return version == null ? JeeDescriptor.SERVLET_2_4 : version;
//$NON-NLS-1$
+ }
+
+ private static void addJEE( String jeeVersion, String ejbVersion, String
servletVersion, String jspVersion )
+ {
+ JeeDescriptor descriptor = new JeeDescriptor( jeeVersion, ejbVersion,
servletVersion, jspVersion );
+ jeeMap.put( jeeVersion, descriptor );
+ ejbMap.put( ejbVersion, descriptor );
+ servletMap.put( servletVersion, descriptor );
+ jspMap.put( jspVersion, descriptor );
+ }
+
+ private static String findEjbVersionInDependencies( MavenProject project )
+ {
+ String[] artifactIds = new String[] { "ejb", "geronimo-spec-ejb" };
//$NON-NLS-1$
+
+ String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
+
+ // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
+ if ( version == null )
+ {
+ if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-ejb_2.1_spec" }, project.getDependencies(), 3 ) != null )
+ return JeeDescriptor.EJB_2_1;
+ }
+ if ( version == null )
+ {
+ if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-ejb_3.0_spec" }, project.getDependencies(), 3 ) != null )
+ return JeeDescriptor.EJB_3_0;
+ }
+
+ return version;
+ }
+
+ private static String findJ2eeVersionInDependencies( MavenProject project )
+ {
+ String[] artifactIds = new String[] { "javaee-api", "j2ee",
"geronimo-spec-j2ee" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
+
+ // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
+ if ( version == null )
+ {
+ if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-j2ee_1.4_spec" }, project.getDependencies(), 3 ) != null )
+ return JeeDescriptor.J2EE_1_4;
+ }
+
+ return version;
+ }
+
+ private static String findServletVersionInDependencies( MavenProject
project )
+ {
+ String[] artifactIds = new String[] { "servlet-api", "servletapi",
"geronimo-spec-servlet" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ String version = IdeUtils.getDependencyVersion( artifactIds,
project.getDependencies(), 3 );
+
+ // For new Geronimo APIs, the version of the artifact isn't the one of
the spec
+ if ( version == null )
+ {
+ if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-servlet_2.4_spec" },
+ project.getDependencies(), 3 )
!= null )
+ return JeeDescriptor.SERVLET_2_4;
+ }
+ if ( version == null )
+ {
+ if ( IdeUtils.getDependencyVersion( new String[] {
"geronimo-servlet_2.5_spec" },
+ project.getDependencies(), 3 )
!= null )
+ return JeeDescriptor.SERVLET_2_5;
+ }
+
+ return version;
}
}
