Author: aheritier
Date: Sun Nov 25 15:10:56 2007
New Revision: 598083
URL: http://svn.apache.org/viewvc?rev=598083&view=rev
Log:
[MECLIPSE-315] RadWebSettingsWriter uses hardcoded webcontent path and ignores
warSourceDirectory
Submitted by: Siarhei Dudzin
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.websettings
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
(with props)
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/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.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?rev=598083&r1=598082&r2=598083&view=diff
==============================================================================
---
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
Sun Nov 25 15:10:56 2007
@@ -124,13 +124,24 @@
* write the websettings file for RAD6.
*
* @param writer where to write to
+ * @throws MojoExecutionException
*/
- private void writeModuleTypeFacetCore( XMLWriter writer )
+ private void writeModuleTypeFacetCore( XMLWriter writer ) throws
MojoExecutionException
{
writer.startElement( WEBSETTINGS_WEBSETTINGS );
writer.addAttribute( WEBSETTINGS_VERSION, "600" );
writer.startElement( WEBSETTINGS_WEBCONTENT );
- writer.writeText( "src/main/webapp" );
+
+ // Generating web content settings based on war plug-in
warSourceDirectory property
+ File warSourceDirectory =
+ new File( IdeUtils.getPluginSetting( config.getProject(),
JeeUtils.ARTIFACT_MAVEN_WAR_PLUGIN,
+ "warSourceDirectory",
//$NON-NLS-1$
+
config.getProject().getBasedir() + "/src/main/webapp" ) ); //$NON-NLS-1$
+ String webContentDir = IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(),
+ warSourceDirectory, false );
+
+ writer.writeText( webContentDir );
+
writer.endElement();
writer.startElement( WEBSETTINGS_CONTEXT_ROOT );
writer.writeText( getContextRoot( warContextRoot ) );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=598083&r1=598082&r2=598083&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Sun Nov 25 15:10:56 2007
@@ -261,5 +261,15 @@
{
testProject( "project-rad-6", new Properties(), "rad-clean", "rad" );
}
+
+ /**
+ * Tests warSourceDirectory setting to be reflected in generated
.websettings
+ * @throws Exception
+ */
+ public void testProject7()
+ throws Exception
+ {
+ testProject( "project-rad-7", new Properties(), "rad-clean", "rad"
);
+ }
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.websettings
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.websettings?rev=598083&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.websettings
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.websettings
Sun Nov 25 15:10:56 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<websettings version="600">
+ <webcontent>WebContent</webcontent>
+ <context-root>project-rad-7</context-root>
+ <project-type>J2EE</project-type>
+ <jsp-level>2.0</jsp-level>
+ <features>
+ <feature>
+ <feature-id>templatefeature</feature-id>
+ </feature>
+ <feature>
+
<feature-id>com.ibm.etools.siteedit.wizards.projectfeature.WebSiteFeature</feature-id>
+ </feature>
+ </features>
+ <lib-modules/>
+</websettings>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml?rev=598083&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
Sun Nov 25 15:10:56 2007
@@ -0,0 +1,34 @@
+<?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>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-7</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+
<warSourceDirectory>WebContent</warSourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
