Author: fgiust
Date: Sun Apr 11 15:40:47 2010
New Revision: 932925
URL: http://svn.apache.org/viewvc?rev=932925&view=rev
Log:
MECLIPSE-652 Ability to map a webapp to the root context
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
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?rev=932925&r1=932924&r2=932925&view=diff
==============================================================================
---
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
Sun Apr 11 15:40:47 2010
@@ -316,7 +316,8 @@ public class EclipsePlugin
private String wtpversion;
/**
- * JEE context name of the WTP module. ( ex. WEB context name ).
+ * JEE context name of the WTP module. ( ex. WEB context name ). You can
use "ROOT" if you want to map the webapp
+ * to the root context.
*
* @parameter expression="${wtpContextName}"
*/
@@ -1349,6 +1350,10 @@ public class EclipsePlugin
{
config.setContextName( project.getArtifactId() );
}
+ else if ( "ROOT".equals(wtpContextName) )
+ {
+ config.setContextName( "" );
+ }
else
{
config.setContextName( wtpContextName );
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Apr 11 15:40:47 2010
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.classpath?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.classpath
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,4 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.project?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.project
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,22 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-60</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the
maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.jdt.core.prefs?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.jdt.core.prefs
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.jdt.core.prefs
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,5 @@
+#Sun Apr 11 17:34:33 CEST 2010
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.component?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.component
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.component
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,7 @@
+<project-modules id="moduleCoreId" project-version="2.0">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-60">
+ <property name="context-root" value=""/>
+ <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+ <property name="java-output-path" value="/target/classes"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="jst.web" version="2.4"/>
+ <installed facet="jst.java" version="1.4"/>
+</faceted-project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml?rev=932925&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
Sun Apr 11 15:40:47 2010
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-60</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <wtpversion>2.0</wtpversion>
+ <wtpContextName>ROOT</wtpContextName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-60-MECLIPSE-652/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
