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 2007/07/08 03:38:38 UTC
svn commit: r554291 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/
main/java/org/apache/maven/plugin/eclipse/writers/wtp/
main/java/org/apache/maven/plug...
Author: brianf
Date: Sat Jul 7 18:38:37 2007
New Revision: 554291
URL: http://svn.apache.org/viewvc?view=rev&rev=554291
Log:
applied Dan's patch for MECLIPSE-272 and MECLIPSE-65
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java Sat Jul 7 18:38:37 2007
@@ -89,12 +89,25 @@
*/
private File basedir;
+
+ /**
+ * Skip the operation when true.
+ *
+ * @parameter expression="${eclipse.skip}" default-value="false"
+ */
+ private boolean skip;
+
+
/**
* @see org.apache.maven.plugin.AbstractMojo#execute()
*/
public void execute()
throws MojoExecutionException
{
+ if( skip )
+ {
+ return;
+ }
// since the eclipse plugin doesn't generate configuration for POM projects, it should neither delete it
if ( "pom".equals( packaging ) ) //$NON-NLS-1$
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Sat Jul 7 18:38:37 2007
@@ -265,6 +265,14 @@
* @parameter expression="${wtpversion}" default-value="none"
*/
private String wtpversion;
+
+ /**
+ * JEE context name of the WTP module. ( ex. WEB context name ).
+ *
+ * @parameter expression="${wtpContextName}" default-value="${project.artifactId}"
+ */
+ private String wtpContextName;
+
/**
* Is it an PDE project? If yes, the plugin adds the necessary natures and build commands to
@@ -782,7 +790,6 @@
}
if ( wtpVersionFloat == 1.0f )
{
-
new EclipseWtpComponentWriter().init( getLog(), config ).write();
}
if ( wtpVersionFloat >= 1.5 )
@@ -890,6 +897,7 @@
config.setProjectFacets( additionalProjectFacets );
config.setSourceDirs( sourceDirs );
config.setAddVersionToProjectName( isAddVersionToProjectName() );
+ config.setContextName( this.wtpContextName );
return config;
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWriterConfig.java Sat Jul 7 18:38:37 2007
@@ -118,6 +118,13 @@
private String projectNameTemplate;
/**
+ * @see EclipsePlugin#deployName()
+ */
+
+ private String contextName;
+
+
+ /**
* Getter for <code>deps</code>.
* @return Returns the deps.
*/
@@ -398,4 +405,15 @@
{
return projectNameTemplate;
}
+
+ public String getContextName()
+ {
+ return this.contextName;
+ }
+
+ public void setContextName( String deployName )
+ {
+ this.contextName = deployName;
+ }
+
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java Sat Jul 7 18:38:37 2007
@@ -94,13 +94,7 @@
writer.writeText( JeeUtils.resolveServletVersion(project) );
writer.endElement();
- // use finalName as context root only if it has been explicitely set
- String contextRoot = project.getArtifactId();
- String finalName = project.getBuild().getFinalName();
- if ( !finalName.equals( project.getArtifactId() + "-" + project.getVersion() ) ) //$NON-NLS-1$
- {
- contextRoot = finalName;
- }
+ String contextRoot = config.getContextName();
writer.startElement( ELT_PROPERTY );
writer.addAttribute( ATTR_NAME, "context-root" ); //$NON-NLS-1$
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponent15Writer.java Sat Jul 7 18:38:37 2007
@@ -55,7 +55,7 @@
{
writer.startElement( ELT_PROPERTY );
writer.addAttribute( ATTR_NAME, ATTR_CONTEXT_ROOT );
- writer.addAttribute( ATTR_VALUE, config.getProject().getArtifactId() );
+ writer.addAttribute( ATTR_VALUE, config.getContextName() );
writer.endElement(); // property
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java Sat Jul 7 18:38:37 2007
@@ -194,7 +194,7 @@
protected void writeContextRoot( XMLWriter writer )
{
writer.startElement( ELT_PROPERTY );
- writer.addAttribute( ATTR_CONTEXT_ROOT, config.getProject().getArtifactId() );
+ writer.addAttribute( ATTR_CONTEXT_ROOT, config.getContextName() );
writer.endElement(); // property
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Sat Jul 7 18:38:37 2007
@@ -166,7 +166,7 @@
protected List reactorProjects;
/**
- * Skip the operation when true
+ * Skip the operation when true.
*
* @parameter expression="${eclipse.skip}" default-value="false"
*/
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.wtpmodules Sat Jul 7 18:38:37 2007
@@ -2,12 +2,12 @@
<wb-module deploy-name="maven-eclipse-plugin-test-project-5">
<module-type module-type-id="jst.web">
<version>2.4</version>
- <property name="context-root" value="maven-eclipse-plugin-test-project-5"/>
+ <property name="context-root" value="contextName"/>
</module-type>
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/maven/maven-core/98.0/maven-core-98.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
</wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml Sat Jul 7 18:38:37 2007
@@ -31,6 +31,7 @@
<version>test</version>
<configuration>
<wtpversion>R7</wtpversion>
+ <wtpContextName>contextName</wtpContextName>
<projectnatures>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
<projectnature>org.eclipse.wst.common.modulecore.ModuleCoreNature</projectnature>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/expected/.settings/org.eclipse.wst.common.component Sat Jul 7 18:38:37 2007
@@ -1,8 +1,8 @@
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="war-test">
- <property name="context-root" value="war-test"/>
+ <property name="context-root" value="contextName"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<property name="java-output-path" value="/target/classes"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
</wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?view=diff&rev=554291&r1=554290&r2=554291
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml Sat Jul 7 18:38:37 2007
@@ -20,6 +20,7 @@
<version>test</version>
<configuration>
<wtpversion>1.5</wtpversion>
+ <wtpContextName>contextName</wtpContextName>
</configuration>
</plugin>
</plugins>