Author: gvanmatre
Date: Fri Feb 23 21:11:34 2007
New Revision: 511212
URL: http://svn.apache.org/viewvc?view=rev&rev=511212
Log:
Applied two patches to the maven tld2claycfg tool submitted by Hermod Opstvedt
(SHALE-408).
Modified:
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld.java
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld2ClayCfgMojo.java
shale/maven/trunk/tld2claycfg/test/pom.xml
Modified:
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld.java
URL:
http://svn.apache.org/viewvc/shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld.java?view=diff&rev=511212&r1=511211&r2=511212
==============================================================================
--- shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld.java
(original)
+++ shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld.java
Fri Feb 23 21:11:34 2007
@@ -25,6 +25,8 @@
private String mbFilter;
+ private String acFilter;
+
public String getMbFilter() {
return mbFilter;
}
@@ -51,5 +53,13 @@
public void setVersion(String version) {
this.version = version;
+ }
+
+ public String getAcFilter() {
+ return acFilter;
+ }
+
+ public void setAcFilter(String acFilter) {
+ this.acFilter = acFilter;
}
}
Modified:
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld2ClayCfgMojo.java
URL:
http://svn.apache.org/viewvc/shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld2ClayCfgMojo.java?view=diff&rev=511212&r1=511211&r2=511212
==============================================================================
---
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld2ClayCfgMojo.java
(original)
+++
shale/maven/trunk/tld2claycfg/mojo/src/main/java/org/apache/shale/Tld2ClayCfgMojo.java
Fri Feb 23 21:11:34 2007
@@ -72,6 +72,7 @@
converter.setFilename(((Tld) tlds.get(i)).getName());
converter.setVersion(((Tld) tlds.get(i)).getVersion());
converter.setMbFilter(((Tld) tlds.get(i)).getMbFilter());
+ converter.setAcFilter(((Tld) tlds.get(i)).getAcFilter());
converter.setDestPath(buildDirectory
+ System.getProperty("file.separator") + "classes"
+ System.getProperty("file.separator") + "META-INF");
Modified: shale/maven/trunk/tld2claycfg/test/pom.xml
URL:
http://svn.apache.org/viewvc/shale/maven/trunk/tld2claycfg/test/pom.xml?view=diff&rev=511212&r1=511211&r2=511212
==============================================================================
--- shale/maven/trunk/tld2claycfg/test/pom.xml (original)
+++ shale/maven/trunk/tld2claycfg/test/pom.xml Fri Feb 23 21:11:34 2007
@@ -24,6 +24,7 @@
<groupId>org.apache.shale</groupId>
<artifactId>TestMojo</artifactId>
<version>1.0-SNAPSHOT</version>
+ <name>Tld2ClayCfg Maven testapplication</name>
<description></description>
<build>
<resources>
@@ -51,31 +52,48 @@
</executions>
<configuration>
<tlds>
+<!--
<tld implementation="org.apache.shale.Tld">
<name>META-INF/tomahawk.tld</name>
<version>1.1.3-SNAPSHOT</version>
-
<mbFilter>(?i).*Listener*,(?i).*validator*,(?i).*converter*,(?i).*action*</mbFilter>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
</tld>
+-->
+<!--
<tld implementation="org.apache.shale.Tld">
<name>META-INF/myfaces_sandbox.tld</name>
<version>1.1.4-SNAPSHOT</version>
-
<mbFilter>(?i).*Listener*,(?i).*validator*,(?i).*converter*,(?i).*action*</mbFilter>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
</tld>
- <tld implementation="org.apache.shale.Tld">
+-->
+ <tld implementation="org.apache.shale.Tld">
<name>META-INF/org/apache/myfaces/tobago/taglib/component/tobago.tld</name>
<version>1.1.9-SNAPSHOT</version>
-
<mbFilter>(?i).*Listener*,(?i).*validator*,(?i).*converter*,(?i).*action*</mbFilter>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
</tld>
<tld implementation="org.apache.shale.Tld">
<name>META-INF/tr.tld</name>
<version>incubator-m1-SNAPSHOT</version>
-
<mbFilter>(?i).*Listener*,(?i).*validator*,(?i).*converter*,(?i).*action*</mbFilter>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
</tld>
<tld implementation="org.apache.shale.Tld">
<name>META-INF/trh.tld</name>
<version>incubator-m1-SNAPSHOT</version>
-
<mbFilter>(?i).*Listener*,(?i).*validator*,(?i).*converter*,(?i).*action*</mbFilter>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
+ </tld>
+<!--
+ <tld implementation="org.apache.shale.Tld">
+ <name>META-INF/html_extended.tld</name>
+ <version>2.0</version>
+
<mbFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</mbFilter>
+
<acFilter>(?i).*Listener.*,(?i).*Validate.*,(?i).*Convert.*</acFilter>
</tld>
+-->
</tlds>
</configuration>
</plugin>
@@ -87,20 +105,42 @@
<artifactId>trinidad-impl</artifactId>
<version>incubator-m1-SNAPSHOT</version>
</dependency>
+<!--
+ <dependency>
+ <groupId>com.ibm.jwl</groupId>
+ <artifactId>jsf-ibm</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.jwl</groupId>
+ <artifactId>jsf-ibm</artifactId>
+ <version>2.0</version>
+ </dependency>
+-->
+<!--
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>1.1.3-SNAPSHOT</version>
</dependency>
+-->
+<!--
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-sandbox</artifactId>
<version>1.1.4-SNAPSHOT</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>1.0.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
