Author: fgiust
Date: Thu Jul 20 14:20:34 2006
New Revision: 424070
URL: http://svn.apache.org/viewvc?rev=424070&view=rev
Log:
handle context-root element changed in WTP 1.5
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15Writer.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponentWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15Writer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15Writer.java?rev=424070&r1=424069&r2=424070&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15Writer.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponent15Writer.java
Thu Jul 20 14:20:34 2006
@@ -16,6 +16,8 @@
package org.apache.maven.plugin.eclipse.writers;
+import org.codehaus.plexus.util.xml.XMLWriter;
+
/**
* Component writer for WTP 1.5. File name has changed in WTP 1.5rc2 and the
<code>project-version</code> attribute has
* been added. These ones are the only differences
@@ -42,6 +44,17 @@
protected String getProjectVersion()
{
return "1.5.0"; //$NON-NLS-1$
+ }
+
+ /**
+ * @param writer
+ */
+ protected void writeContextRoot( XMLWriter writer )
+ {
+ writer.startElement( ELT_PROPERTY );
+ writer.addAttribute( ATTR_NAME, ATTR_CONTEXT_ROOT );
+ writer.addAttribute( ATTR_VALUE, config.getProject().getArtifactId() );
+ writer.endElement(); // property
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponentWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponentWriter.java?rev=424070&r1=424069&r2=424070&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponentWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseWtpComponentWriter.java
Thu Jul 20 14:20:34 2006
@@ -43,12 +43,12 @@
/**
* Context root attribute.
*/
- private static final String ATTR_CONTEXT_ROOT = "context-root";
//$NON-NLS-1$
+ public static final String ATTR_CONTEXT_ROOT = "context-root";
//$NON-NLS-1$
/**
* The .settings folder for Web Tools Project 1.x release.
*/
- private static final String DIR_WTP_SETTINGS = ".settings"; //$NON-NLS-1$
+ public static final String DIR_WTP_SETTINGS = ".settings"; //$NON-NLS-1$
/**
* File name where the WTP component settings will be stored for our
Eclipse Project.
@@ -133,9 +133,7 @@
"warSourceDirectory", //$NON-NLS-1$
"/src/main/webapp" ); //$NON-NLS-1$
- writer.startElement( ELT_PROPERTY );
- writer.addAttribute( ATTR_CONTEXT_ROOT,
config.getProject().getArtifactId() );
- writer.endElement(); // property
+ writeContextRoot( writer );
writer.startElement( ELT_WB_RESOURCE );
writer.addAttribute( ATTR_DEPLOY_PATH, "/" ); //$NON-NLS-1$
@@ -183,6 +181,16 @@
writer.endElement(); // wb-module
writer.endElement(); // project-modules
+ }
+
+ /**
+ * @param writer
+ */
+ protected void writeContextRoot( XMLWriter writer )
+ {
+ writer.startElement( ELT_PROPERTY );
+ writer.addAttribute( ATTR_CONTEXT_ROOT,
config.getProject().getArtifactId() );
+ writer.endElement(); // property
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component?rev=424070&r1=424069&r2=424070&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component
Thu Jul 20 14:20:34 2006
@@ -1,5 +1,8 @@
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="maven-eclipse-plugin-test-project-20">
- <wb-resource deploy-path="/" source-path="src/main/java"/>
- </wb-module>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="maven-eclipse-plugin-test-project-20">
+ <property name="context-root"
value="maven-eclipse-plugin-test-project-20"/>
+ <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>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml?rev=424070&r1=424069&r2=424070&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/pom.xml
Thu Jul 20 14:20:34 2006
@@ -4,6 +4,7 @@
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-20</artifactId>
<version>20</version>
+ <packaging>war</packaging>
<name>maven-eclipse-plugin-test-project-20</name>
<build>
<plugins>
