You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/08/14 10:39:47 UTC
svn commit: r431307 - in /maven/plugins/trunk/maven-ear-plugin/src:
main/java/org/apache/maven/plugin/ear/WebModule.java site/apt/modules.apt
site/fml/faq.fml
Author: snicoll
Date: Mon Aug 14 01:39:44 2006
New Revision: 431307
URL: http://svn.apache.org/viewvc?rev=431307&view=rev
Log:
MEAR-29: revert the ability to deactivate <context-root> generation. not compliant with the spec.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java?rev=431307&r1=431306&r2=431307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/WebModule.java Mon Aug 14 01:39:44 2006
@@ -39,8 +39,6 @@
private String contextRoot;
- private Boolean noContextRoot = Boolean.FALSE;
-
public WebModule()
{
}
@@ -59,14 +57,10 @@
writer.writeText( getUri() );
writer.endElement(); // web-uri
- // If noContextRoot is true, skip the generation of
- // the context-root element
- if ( !noContextRoot.booleanValue() )
- {
- writer.startElement( CONTEXT_ROOT_FIELD );
- writer.writeText( getContextRoot() );
- writer.endElement(); // context-root
- }
+ writer.startElement( CONTEXT_ROOT_FIELD );
+ writer.writeText( getContextRoot() );
+ writer.endElement(); // context-root
+
writer.endElement(); // web
writer.endElement(); // module
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt?rev=431307&r1=431306&r2=431307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt Mon Aug 14 01:39:44 2006
@@ -266,8 +266,6 @@
* <<contextRoot>> - sets the context root of this web artifact.
- * <<noContextRoot>> - specify if the context root element should be generated.
-
* {wsrModule} Properties
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml?rev=431307&r1=431306&r2=431307&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/fml/faq.fml Mon Aug 14 01:39:44 2006
@@ -38,19 +38,7 @@
configuration</a> section.
</p>
</answer>
- </faq>
- <faq id="portlet">
- <question>
- The EAR Plugin always generate a 'context-root' element for web applications and it does not work with
- portlet deployment. How do we solve this issue?
- </question>
- <answer>
- <p>
- Simply configure the web module by specifying the 'noContextRoot' boolean parameter. If this parameter
- is true, the 'context-root' element is not generated for the related web module.
- </p>
- </answer>
- </faq>
+ </faq>
</part>
</faqs>