You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/05/28 16:50:28 UTC
svn commit: r542243 - in
/myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main:
java/org/apache/myfaces/trinidadbuild/plugin/faces/
resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/
Author: baranda
Date: Mon May 28 07:50:27 2007
New Revision: 542243
URL: http://svn.apache.org/viewvc?view=rev&rev=542243
Log:
Implements TRINIDAD-41 (Create more specific "packageContains" configuration attributes for the maven-faces-plugin, for validators and converters)
Modified:
myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
Modified: myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java?view=diff&rev=542243&r1=542242&r2=542243
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java Mon May 28 07:50:27 2007
@@ -155,6 +155,8 @@
Transformer transformer = transFactory.newTransformer(xslSource);
transformer.setParameter("packageContains", packageContains);
transformer.setParameter("typePrefix", typePrefix);
+ transformer.setParameter("converterPackageContains", getParameter(converterPackageContains, packageContains));
+ transformer.setParameter("validatorPackageContains", getParameter(validatorPackageContains, packageContains));
transformer.transform(mergedSource, mergedResult);
resultStream.close();
@@ -212,6 +214,20 @@
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+ private String getParameter(String paramName, String defaultValue)
+ {
+ String param;
+
+ if (paramName.length() > 0)
+ {
+ param = paramName;
+ }
+ else
+ {
+ param = defaultValue;
+ }
+ return param;
+ }
/**
* @parameter expression="${project}"
@@ -234,6 +250,16 @@
* @parameter
*/
private String packageContains = "";
+
+ /**
+ * @parameter
+ */
+ private String converterPackageContains = "";
+
+ /**
+ * @parameter
+ */
+ private String validatorPackageContains = "";
/**
Modified: myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl?view=diff&rev=542243&r1=542242&r2=542243
==============================================================================
--- myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl (original)
+++ myfaces/trinidad/branches/faces-1_2-070522/plugins/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl Mon May 28 07:50:27 2007
@@ -29,6 +29,8 @@
<xsl:output method="xml" indent="yes"/>
<xsl:param name="packageContains" />
+ <xsl:param name="converterPackageContains" />
+ <xsl:param name="validatorPackageContains" />
<xsl:param name="typePrefix" />
@@ -53,7 +55,7 @@
<xsl:apply-templates select="javaee:factory" />
<xsl:apply-templates select="javaee:component[not(contains(javaee:component-extension/mfp:component-class-modifier/text(), 'abstract')) and
starts-with(javaee:component-type, $typePrefix)]" />
- <xsl:apply-templates select="javaee:converter[contains(javaee:converter-class, $packageContains)]" />
+ <xsl:apply-templates select="javaee:converter[contains(javaee:converter-class, $converterPackageContains)]" />
<xsl:apply-templates select="javaee:managed-bean[contains(javaee:managed-bean-class, $packageContains)]" />
<xsl:apply-templates select="javaee:navigation-rule" />
<xsl:apply-templates select="javaee:referenced-bean" />
@@ -71,7 +73,7 @@
</xsl:element>
</xsl:for-each>
<xsl:apply-templates select="javaee:lifecycle[contains(javaee:phase-listener, $packageContains)]" />
- <xsl:apply-templates select="javaee:validator[contains(javaee:validator-class, $packageContains)]" />
+ <xsl:apply-templates select="javaee:validator[contains(javaee:validator-class, $validatorPackageContains)]" />
</xsl:element>
</xsl:template>