You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/05/15 17:21:02 UTC
svn commit: r538204 - in
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin:
eclipse/writers/rad/RadWebSettingsWriter.java
eclipse/writers/rad/RadWebsiteConfigWriter.java ide/JeeUtils.java
Author: aheritier
Date: Tue May 15 08:21:01 2007
New Revision: 538204
URL: http://svn.apache.org/viewvc?view=rev&rev=538204
Log:
MECLIPSE-268 : JSP version is now dynamically setted
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.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/rad/RadWebSettingsWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?view=diff&rev=538204&r1=538203&r2=538204
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java Tue May 15 08:21:01 2007
@@ -26,21 +26,21 @@
import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+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;
/**
- * Creates a .settings folder for Eclipse WTP 1.x release and writes out the
- * configuration under it.
+ * Creates a .settings folder for Eclipse WTP 1.x release and writes out the configuration under it.
*
* @author <a href="mailto:nir@cfc.at">Richard van Nieuwenhoven </a>
*/
-public class RadWebSettingsWriter
- extends AbstractEclipseWriter
+public class RadWebSettingsWriter extends AbstractEclipseWriter
{
- private static final String COM_IBM_ETOOLS_SITEEDIT_WIZARDS_PROJECTFEATURE_WEB_SITE_FEATURE = "com.ibm.etools.siteedit.wizards.projectfeature.WebSiteFeature";
+ private static final String COM_IBM_ETOOLS_SITEEDIT_WIZARDS_PROJECTFEATURE_WEB_SITE_FEATURE =
+ "com.ibm.etools.siteedit.wizards.projectfeature.WebSiteFeature";
private static final String WEBSETTINGS_CONTEXT_ROOT = "context-root";
@@ -82,11 +82,11 @@
/**
* write the websettings file for RAD6 if needed.
+ *
* @throws MojoExecutionException
* when writing the config files was not possible
*/
- public void write()
- throws MojoExecutionException
+ public void write() throws MojoExecutionException
{
FileWriter w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( config.getProject().getPackaging() ) )
@@ -126,7 +126,7 @@
writer.writeText( "J2EE" );
writer.endElement();
writer.startElement( WEBSETTINGS_JSP_LEVEL );
- writer.writeText( "1.3" );
+ writer.writeText( JeeUtils.resolveJspVersion( config.getProject() ) );
writer.endElement();
writer.startElement( WEBSETTINGS_FEATURES );
writer.startElement( WEBSETTINGS_FEATURE );
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java?view=diff&rev=538204&r1=538203&r2=538204
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java Tue May 15 08:21:01 2007
@@ -35,13 +35,11 @@
import org.codehaus.plexus.util.xml.XMLWriter;
/**
- * Creates a .settings folder for Eclipse WTP 1.x release and writes out the
- * configuration under it.
+ * Creates a .settings folder for Eclipse WTP 1.x release and writes out the configuration under it.
*
* @author <a href="mailto:nir@cfc.at">Richard van Nieuwenhoven</a>
*/
-public class RadWebsiteConfigWriter
- extends AbstractEclipseWriter
+public class RadWebsiteConfigWriter extends AbstractEclipseWriter
{
private static final String WEBSITE_CONFIG_FILENAME = ".website-config";
@@ -55,8 +53,7 @@
/**
* write the website-config file for RAD6 if needed.
*
- * @see AbstractWtpResourceWriter#write(EclipseSourceDir[],
- * ArtifactRepository, File)
+ * @see AbstractWtpResourceWriter#write(EclipseSourceDir[], ArtifactRepository, File)
* @param sourceDirs
* all eclipse source directorys
* @param localRepository
@@ -66,8 +63,7 @@
* @throws MojoExecutionException
* when writing the config files was not possible
*/
- public void write()
- throws MojoExecutionException
+ public void write() throws MojoExecutionException
{
MavenProject project = config.getProject();
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=538204&r1=538203&r2=538204
==============================================================================
--- 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 08:21:01 2007
@@ -96,6 +96,29 @@
return version == null ? JeeDescriptor.J2EE_1_4 : version; //$NON-NLS-1$
}
+ public static String resolveJspVersion( MavenProject project )
+ {
+ String version = findJspVersionInDependencies( project );
+
+ if ( version == null )
+ {
+ // No jsp dependency detected. Try to resolve the jsp
+ // version from J2EE/JEE.
+ JeeDescriptor descriptor = getJeeDescriptorFromJeeVersion( findJeeVersionInDependencies( project ) );
+ if ( descriptor != null )
+ version = descriptor.getJspVersion();
+ }
+ if ( version == null )
+ {
+ // No jsp dependency detected. Try to resolve the jsp
+ // version from Servlet.
+ JeeDescriptor descriptor = getJeeDescriptorFromServletVersion( findServletVersionInDependencies( project ) );
+ if ( descriptor != null )
+ version = descriptor.getJspVersion();
+ }
+ return version == null ? JeeDescriptor.JSP_2_0 : version; //$NON-NLS-1$
+ }
+
public static String resolveServletVersion( MavenProject project )
{
String version = findServletVersionInDependencies( project );
@@ -157,6 +180,11 @@
return version;
}
+ private static String findJspVersionInDependencies( MavenProject project )
+ {
+ return null;
+ }
+
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$
@@ -179,5 +207,4 @@
return version;
}
-
}