You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/08/08 23:46:15 UTC
svn commit: r684109 [1/2] - in /myfaces/commons/trunk: ./
myfaces-commons-converters/
myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/
myfaces-commons-examples/ myfaces-commons-utils/
myfaces-commons-utils/src/test/java/org/ my...
Author: lu4242
Date: Fri Aug 8 14:46:14 2008
New Revision: 684109
URL: http://svn.apache.org/viewvc?rev=684109&view=rev
Log:
reformat poms, add some test for validate tld and faces-config.xml, update version of shale-test to 1.0.5
Added:
myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/
myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java (with props)
myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java (with props)
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java (with props)
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java (with props)
myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java (with props)
myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/
myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java (with props)
myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java (with props)
Modified:
myfaces/commons/trunk/myfaces-commons-converters/pom.xml
myfaces/commons/trunk/myfaces-commons-examples/pom.xml
myfaces/commons/trunk/myfaces-commons-utils/pom.xml
myfaces/commons/trunk/myfaces-commons-validators/pom.xml
myfaces/commons/trunk/pom.xml
Modified: myfaces/commons/trunk/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-converters/pom.xml?rev=684109&r1=684108&r2=684109&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/trunk/myfaces-commons-converters/pom.xml Fri Aug 8 14:46:14 2008
@@ -1,264 +1,216 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
-->
<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>
- <parent>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <artifactId>myfaces-converters</artifactId>
- <packaging>jar</packaging>
- <name>Apache MyFaces Commons Converters</name>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>myfaces-converters</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache MyFaces Commons Converters</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makefacesconfig</id>
+ <configuration>
+ <templateFile>faces-config12.vm</templateFile>
+ <xmlFile>META-INF/faces-config.xml</xmlFile>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_converter_tags</id>
+ <configuration>
+ <jsfVersion>12</jsfVersion>
+ </configuration>
+ <goals>
+ <goal>make-converter-tags</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makemcctld</id>
+ <configuration>
+ <xmlFile>META-INF/mcc.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/mcc-base.tld</xmlBaseFile>
+ <templateFile>tomahawk12.vm</templateFile>
+ <params>
+ <shortname>mcc</shortname>
+ <uri>http://myfaces.apache.org/commons/converters</uri>
+ <displayname>Myfaces Commons Converter Tag Library 1.2.</displayname>
+ <description>
+ MyFaces subproject that contains converters to be used with any JSF implementation.
+ </description>
+ </params>
+ <modelIds>
+ <modelId>myfaces-converters</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makemcctaglib</id>
+ <configuration>
+ <xmlFile>META-INF/mcc.taglib.xml</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
+ <templateFile>facelets-taglib.vm</templateFile>
+ <params>
+ <shortname>mcc</shortname>
+ <uri>http://myfaces.apache.org/commons/converters</uri>
+ </params>
+ <modelIds>
+ <modelId>myfaces-converters</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-commons-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-commons-utils</artifactId>
+ <classifier>tests</classifier>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.vm</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makefacesconfig</id>
- <configuration>
- <templateFile>faces-config12.vm</templateFile>
- <xmlFile>META-INF/faces-config.xml</xmlFile>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>make_converter_tags</id>
- <configuration>
- <jsfVersion>12</jsfVersion>
- </configuration>
- <goals>
- <goal>make-converter-tags</goal>
- </goals>
- </execution>
- <execution>
- <id>makemcctld</id>
- <configuration>
- <xmlFile>META-INF/mcc.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/mcc-base.tld</xmlBaseFile>
- <templateFile>tomahawk12.vm</templateFile>
- <params>
- <shortname>mcc</shortname>
- <uri>http://myfaces.apache.org/commons/converters</uri>
- <displayname>Myfaces Commons Converter Tag Library 1.2.</displayname>
- <description> MyFaces subproject that contains converters to be used with any JSF implementation.</description>
- </params>
- <modelIds>
- <modelId>myfaces-converters</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makemcctaglib</id>
- <configuration>
- <xmlFile>META-INF/mcc.taglib.xml</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
- <templateFile>facelets-taglib.vm</templateFile>
- <params>
- <shortname>mcc</shortname>
- <uri>http://myfaces.apache.org/commons/converters</uri>
- </params>
- <modelIds>
- <modelId>myfaces-converters</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-faces-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <configuration>
- <taglibs>
- <mcc>http://myfaces.apache.org/commons/converters</mcc>
- </taglibs>
- <packageContains>org.apache</packageContains>
- <converterPackageContains>org.apache</converterPackageContains>
- <validatorPackageContains>org.apache</validatorPackageContains>
- <typePrefix>org.apache</typePrefix>
- <packageContains>org.apache</packageContains>
- <removeRenderers>true</removeRenderers>
- <force>true</force>
- <type>myfaces</type>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>generate-master-faces-config</id>
- <goals>
- <goal>generate-master-faces-config</goal>
- </goals>
- <configuration>
- <sourcePath>.</sourcePath>
- <sourceDirectory>src/main/maven-faces-plugin</sourceDirectory>
- </configuration>
- </execution>
- <execution>
- <id>generate-faces-config</id>
- <goals>
- <goal>generate-faces-config</goal>
- <goal>generate-jsp-taglibs</goal>
- <goal>generate-facelets-taglibs</goal>
- </goals>
- <configuration>
- <localResource>
- ${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin/faces-config.xml
- </localResource>
- <targetPath>META-INF/faces-config.xml</targetPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <copy
- todir="${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin//">
- <fileset dir="${basedir}/src/main/maven-faces-plugin/"/>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>myfaces-commons-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.4</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.5.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <version>13-1.7.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Added: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+/**
+ * @author Leonardo Uribe
+ */
+
+public class CommonsConverterClassElementTestCase extends
+ AbstractClassElementTestCase
+{
+
+ public CommonsConverterClassElementTestCase()
+ {
+ resource.add("META-INF/mcc.tld");
+ resource.add("META-INF/faces-config.xml");
+ }
+}
Propchange: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterClassElementTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+/**
+ * @author Leonardo Uribe
+ */
+
+public class CommonsConverterTagLibTestCase extends AbstractTagLibTestCase
+{
+
+ protected static final String META_INF = "META-INF/";
+
+ public CommonsConverterTagLibTestCase()
+ {
+ tldPaths = new String[1];
+ tldPaths[0] = META_INF + "mcc.tld";
+ }
+
+}
Propchange: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/test/CommonsConverterTagLibTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/commons/trunk/myfaces-commons-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-examples/pom.xml?rev=684109&r1=684108&r2=684109&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-examples/pom.xml (original)
+++ myfaces/commons/trunk/myfaces-commons-examples/pom.xml Fri Aug 8 14:46:14 2008
@@ -1,76 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>commons</artifactId>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+<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">
+ <parent>
+ <artifactId>commons</artifactId>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-commons-examples</artifactId>
+ <packaging>war</packaging>
+ <name>Apache MyFaces Commons Examples</name>
<version>1.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>myfaces-commons-examples</artifactId>
- <packaging>war</packaging>
- <name>Apache MyFaces Commons Examples</name>
- <version>1.2.0-SNAPSHOT</version>
- <url>http://myfaces.apache.org</url>
- <build>
- <finalName>myfaces-commons-examples</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.8</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>myfaces-validators</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>myfaces-converters</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <url>http://myfaces.apache.org</url>
+ <build>
+ <finalName>myfaces-commons-examples</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.8</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>apache-maven-snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-validators</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: myfaces/commons/trunk/myfaces-commons-utils/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-utils/pom.xml?rev=684109&r1=684108&r2=684109&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-utils/pom.xml (original)
+++ myfaces/commons/trunk/myfaces-commons-utils/pom.xml Fri Aug 8 14:46:14 2008
@@ -1,47 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
-->
-<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>
- <parent>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <artifactId>myfaces-commons-utils</artifactId>
- <packaging>jar</packaging>
- <name>Apache MyFaces Commons Utils</name>
+<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>
+ <parent>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>myfaces-commons-utils</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache MyFaces Commons Utils</name>
- <dependencies>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * This test makes sure all of our components, tags, renderers,
+ * validators, converters, action listeners, phase listeners and
+ * core implementation classes are in the build.
+ *
+ * This class has been copy and pasted into both tomahawk and core
+ * in order to avoid a compile scoped dependency on junit in shared.
+ *
+ * @see ClassElementHandler
+ * @author Dennis Byrne
+ */
+
+public abstract class AbstractClassElementTestCase extends TestCase
+{
+
+ private Log log = LogFactory.getLog(AbstractClassElementTestCase.class);
+
+ protected List resource = new ArrayList();
+ private List className = new ArrayList();
+
+ protected void setUp() throws Exception
+ {
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setValidating(false);
+ factory.setNamespaceAware(false);
+
+ SAXParser parser = factory.newSAXParser();
+ ClassElementHandler handler = new ClassElementHandler();
+
+ Iterator iterator = resource.iterator();
+
+ while (iterator.hasNext())
+ {
+ String resourceName = (String) iterator.next();
+
+ InputStream is = getClass().getClassLoader().getResourceAsStream(
+ resourceName);
+
+ if (is == null)
+ is = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(resourceName);
+
+ if (is == null)
+ throw new Exception("Could not locate resource :"
+ + resourceName);
+
+ parser.parse(is, handler);
+ }
+
+ className.addAll(handler.getClassName());
+ }
+
+ public void testClassPath()
+ {
+ int i = 0;
+ for (; i < className.size(); i++)
+ {
+ String clazz = (String) className.get(i);
+
+ try
+ {
+ getClass().getClassLoader().loadClass(clazz);
+ }
+ catch (ClassNotFoundException e)
+ {
+ try
+ {
+ Thread.currentThread().getContextClassLoader().loadClass(
+ clazz);
+ }
+ catch (ClassNotFoundException e2)
+ {
+ assertFalse("Could not load " + clazz, true);
+ }
+ }
+ }
+ log.debug((i + 1) + " class found ");
+ }
+}
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractClassElementTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,263 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
+import net.sf.maventaglib.checker.Tag;
+import net.sf.maventaglib.checker.TagAttribute;
+import net.sf.maventaglib.checker.Tld;
+import net.sf.maventaglib.checker.TldParser;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+
+/**
+ * Insures the following ...
+ * <ul>
+ * <li> Tag handlers have setters for all tag attributes</li>
+ * <li> All tag handlers are in the classpath</li>
+ * <li> Tag handlers do not appear in the TLD more than once</li>
+ * <li> Tag handler attributes do not occur mare than once</li>
+ * </ul>
+ *
+ * @author Dennis Byrne
+ * @see http://maven-taglib.sourceforge.net/ for dependency download
+ */
+
+public abstract class AbstractTagLibTestCase extends TestCase
+{
+ private static Log log = LogFactory.getLog(AbstractTagLibTestCase.class);
+
+ protected Tld[] tlds;
+
+ protected String[] tldPaths;
+
+ private ClassLoader classLoader = getClass().getClassLoader();
+
+ /**
+ * Unmarshall TLDs to an object model. TLDs are supplied by a subclass.
+ */
+
+ protected void setUp() throws Exception
+ {
+
+ if (tldPaths == null)
+ throw new NullPointerException(
+ "tldPaths cannot point to null before setUp() is called");
+
+ int length = tldPaths.length;
+
+ if (length == 0)
+ throw new IllegalStateException(
+ "tldPaths should have at least one resource path");
+
+ tlds = new Tld[length];
+
+ for (int t = 0; t < length; t++)
+ {
+ String name = tldPaths[t];
+
+ InputStream stream = classLoader.getResourceAsStream(name);
+
+ if (stream == null)
+ throw new NullPointerException(
+ "couldn't get an input stream for " + name);
+
+ tlds[t] = TldTestUtils.getTld(name, stream);
+ stream.close();
+ }
+ }
+
+ public void testUniqueTagTestCase() throws Exception
+ {
+
+ for (int lib = 0; lib < tlds.length; lib++)
+ {
+ Tld tld = tlds[lib];
+ List tagNames = new ArrayList();
+ Tag[] tags = tld.getTags();
+
+ for (int t = 0; t < tags.length; t++)
+ {
+ Tag tag = tags[t];
+
+ if (tag == null)
+ throw new NullPointerException("tag");
+
+ String name = tag.getName();
+ String msg = name + " found more than once in " + tldPaths[lib];
+ assertFalse(msg, tagNames.contains(name));
+ tagNames.add(name);
+ } // end t
+ } // end lib
+ }
+
+ public void testUniqueTagAttributes() throws Exception
+ {
+
+ for (int lib = 0; lib < tlds.length; lib++)
+ {
+ Tld tld = tlds[lib];
+ Tag[] tags = tld.getTags();
+
+ for (int t = 0; t < tags.length; t++)
+ {
+
+ Tag tag = tags[t];
+ assertUniqueTagAttributes(tag, tldPaths[lib]);
+
+ } // end t
+ } // end lib
+ }
+
+ private void assertUniqueTagAttributes(final Tag tag, final String path)
+ {
+
+ List attributeNames = new ArrayList();
+ TagAttribute[] atts = tag.getAttributes();
+ String tagName = tag.getName();
+
+ for (int a = 0; a < atts.length;)
+ {
+
+ TagAttribute att = atts[a++];
+ String name = att.getAttributeName();
+ String msg = " @" + name + " of " + path + ":" + tagName
+ + " is duplicated.";
+ assertFalse(msg, attributeNames.contains(name));
+ attributeNames.add(name);
+
+ } // end a
+
+ }
+
+ /**
+ * Make sure the class exists. Make sure there is a setter for each
+ * attribute.
+ */
+
+ public void testSetters() throws Exception
+ {
+
+ for (int t = 0; t < tlds.length; t++)
+ {
+ Tld tld = tlds[t];
+ Tag[] tags = tld.getTags();
+
+ for (int s = 0; s < tags.length; s++)
+ {
+ Tag tag = tags[s];
+ String filename = tld.getFilename();
+
+ Object object = TldTestUtils.makeTagClassInstance(tag,
+ filename, classLoader);
+ log.debug("filename = " + filename + " ; tag = "
+ + tag.getName());
+ assertSetters(tag, filename, object);
+
+ } // end for tag
+ } // end for lib
+
+ }
+
+ private void assertSetters(final Tag tag, final String path,
+ final Object object)
+ {
+
+ TagAttribute[] attributes = tag.getAttributes();
+ String tagName = tag.getName();
+
+ for (int a = 0; a < attributes.length; a++)
+ {
+ TagAttribute attribute = attributes[a];
+ String name = attribute.getAttributeName();
+
+ if (name == null || "".equals(name.trim()))
+ throw new IllegalStateException(path + ":" + tagName
+ + " has a nameless attribute ");
+
+ String msg = path + ":" + tagName + "@" + name + " exists, but "
+ + object.getClass().getName() + " has no setter.";
+
+ assertTrue(msg, PropertyUtils.isWriteable(object, name));
+ } // end for attributes
+
+ }
+
+ private static class TldTestUtils
+ {
+ private static Log log = LogFactory.getLog(TldTestUtils.class);
+
+ private static DocumentBuilderFactory dbf = DocumentBuilderFactory
+ .newInstance();
+
+ public static Tld getTld(String name, InputStream stream)
+ throws Exception
+ {
+ if (stream == null)
+ log.error(" input stream is null ");
+
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document doc = db.parse(stream);
+
+ return TldParser.parse(doc, name);
+ }
+
+ public static Object makeTagClassInstance(Tag tag, String filename,
+ ClassLoader classLoader) throws Exception
+ {
+
+ String clazzName = tag.getTagClass();
+
+ if (clazzName == null || "".equals(clazzName.trim()))
+ throw new NullPointerException(tag.getName()
+ + " is missing a tag class.");
+
+ try
+ {
+
+ Class clazz = classLoader.loadClass(clazzName);
+ return clazz.newInstance();
+
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new ClassNotFoundException(clazzName);
+ }
+ catch (IllegalAccessException ie)
+ {
+ throw new IllegalAccessException(clazzName);
+ }
+ catch (InstantiationException iste)
+ {
+ throw new InstantiationException(clazzName);
+ }
+ }
+ }
+}
\ No newline at end of file
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/AbstractTagLibTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java (added)
+++ myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * @see AbstractClassElementTestCase
+ * @author Dennis Byrne
+ */
+
+public class ClassElementHandler extends DefaultHandler
+{
+
+ private boolean clazz ;
+ private List elementName = new ArrayList();
+ private List className = new ArrayList();
+ private StringBuffer buffer ;
+
+ public ClassElementHandler(){
+
+ elementName.add("component-class");
+ elementName.add("tag-class");
+ elementName.add("renderer-class");
+ elementName.add("validator-class");
+ elementName.add("converter-class");
+ elementName.add("action-listener");
+ elementName.add("navigation-handler");
+ elementName.add("variable-resolver");
+ elementName.add("property-resolver");
+ elementName.add("phase-listener");
+
+ }
+
+ public void characters(char[] ch, int start, int length)
+ throws SAXException
+ {
+ if (clazz)
+ {
+ String string = new String(ch, start, length);
+ if(string != null)
+ {
+ buffer.append(string.trim());
+ }
+ }
+ }
+
+ public void startElement(
+ String ns, String local, String qName, Attributes atts)
+ throws SAXException
+ {
+
+ clazz = elementName.contains(qName);
+
+ if(clazz)
+ buffer = new StringBuffer();
+
+ }
+
+ public void endElement(String ns, String local, String qName)
+ throws SAXException
+ {
+
+ if(clazz){
+ className.add(buffer.toString());
+ clazz = false;
+ }
+
+ }
+
+ public List getClassName()
+ {
+ return className;
+ }
+
+}
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-utils/src/test/java/org/apache/myfaces/commons/test/ClassElementHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/commons/trunk/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/pom.xml?rev=684109&r1=684108&r2=684109&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/pom.xml Fri Aug 8 14:46:14 2008
@@ -1,283 +1,239 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
-->
-<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>
- <parent>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <artifactId>myfaces-validators</artifactId>
- <packaging>jar</packaging>
- <name>Apache MyFaces Commons Validators</name>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*.vm</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makefacesconfig</id>
- <configuration>
- <templateFile>faces-config12.vm</templateFile>
- <xmlFile>META-INF/faces-config.xml</xmlFile>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makeval</id>
- <goals>
- <goal>make-validators</goal>
- </goals>
- <configuration>
- <jsfVersion>12</jsfVersion>
- </configuration>
- </execution>
- <execution>
- <id>make_validator_tags</id>
- <configuration>
- <jsfVersion>12</jsfVersion>
- </configuration>
- <goals>
- <goal>make-validator-tags</goal>
- </goals>
- </execution>
- <execution>
- <id>makemcctld</id>
- <configuration>
- <xmlFile>META-INF/mcc.tld</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/mcc-base.tld</xmlBaseFile>
- <templateFile>tomahawk12.vm</templateFile>
- <params>
- <shortname>mcv</shortname>
- <uri>http://myfaces.apache.org/commons/validators</uri>
- <displayname>Myfaces Commons Validator Tag Library 1.2.</displayname>
- <description> MyFaces subproject that contains validator to be used with any JSF 1.2 implementation.</description>
- </params>
- <modelIds>
- <modelId>myfaces-validators</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- <execution>
- <id>makemcctaglib</id>
- <configuration>
- <xmlFile>META-INF/mcc.taglib.xml</xmlFile>
- <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
- <templateFile>facelets-taglib.vm</templateFile>
- <params>
- <shortname>mcv</shortname>
- <uri>http://myfaces.apache.org/commons/validators</uri>
- </params>
- <modelIds>
- <modelId>myfaces-validators</modelId>
- </modelIds>
- </configuration>
- <goals>
- <goal>make-config</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-faces-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <configuration>
- <taglibs>
- <mcv>http://myfaces.apache.org/commons/validators</mcv>
- </taglibs>
- <packageContains>org.apache</packageContains>
- <converterPackageContains>org.apache</converterPackageContains>
- <validatorPackageContains>org.apache</validatorPackageContains>
- <typePrefix>org.apache</typePrefix>
- <packageContains>org.apache</packageContains>
- <removeRenderers>true</removeRenderers>
- <force>true</force>
- <jsfVersion>1.2</jsfVersion>
- <type>myfaces</type>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>generate-master-faces-config</id>
- <goals>
- <goal>generate-master-faces-config</goal>
- </goals>
- <configuration>
- <sourcePath>.</sourcePath>
- <sourceDirectory>src/main/maven-faces-plugin</sourceDirectory>
- </configuration>
- </execution>
- <execution>
- <id>generate-faces-config</id>
- <goals>
- <goal>generate-faces-config</goal>
- <goal>generate-jsp-taglibs</goal>
- <goal>generate-facelets-taglibs</goal>
- </goals>
- <configuration>
- <localResource>${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin/faces-config.xml</localResource>
- <targetPath>META-INF/faces-config.xml</targetPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin//">
- <fileset dir="${basedir}/src/main/maven-faces-plugin/"/>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.commons</groupId>
- <artifactId>myfaces-commons-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>cactus</groupId>
- <artifactId>cactus</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+<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>
+ <parent>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>commons</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>myfaces-validators</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache MyFaces Commons Validators</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makefacesconfig</id>
+ <configuration>
+ <templateFile>faces-config12.vm</templateFile>
+ <xmlFile>META-INF/faces-config.xml</xmlFile>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makeval</id>
+ <goals>
+ <goal>make-validators</goal>
+ </goals>
+ <configuration>
+ <jsfVersion>12</jsfVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>make_validator_tags</id>
+ <configuration>
+ <jsfVersion>12</jsfVersion>
+ </configuration>
+ <goals>
+ <goal>make-validator-tags</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makemcvtld</id>
+ <configuration>
+ <xmlFile>META-INF/mcv.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/mcv-base.tld</xmlBaseFile>
+ <templateFile>tomahawk12.vm</templateFile>
+ <params>
+ <shortname>mcv</shortname>
+ <uri>http://myfaces.apache.org/commons/validators</uri>
+ <displayname>Myfaces Commons Validator Tag Library 1.2.</displayname>
+ <description>
+ MyFaces subproject that contains validator to be used with any JSF 1.2
+ implementation.
+ </description>
+ </params>
+ <modelIds>
+ <modelId>myfaces-validators</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makemcctaglib</id>
+ <configuration>
+ <xmlFile>META-INF/mcc.taglib.xml</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/facelets-taglib-base.xml</xmlBaseFile>
+ <templateFile>facelets-taglib.vm</templateFile>
+ <params>
+ <shortname>mcv</shortname>
+ <uri>http://myfaces.apache.org/commons/validators</uri>
+ </params>
+ <modelIds>
+ <modelId>myfaces-validators</modelId>
+ </modelIds>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.3.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-commons-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-commons-utils</artifactId>
+ <classifier>tests</classifier>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>cactus</groupId>
+ <artifactId>cactus</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
Added: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+/**
+ * @author Leonardo Uribe
+ */
+
+public class CommonsValidatorClassElementTestCase extends
+ AbstractClassElementTestCase
+{
+
+ public CommonsValidatorClassElementTestCase()
+ {
+ resource.add("META-INF/mcv.tld");
+ resource.add("META-INF/faces-config.xml");
+ }
+}
Propchange: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorClassElementTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java?rev=684109&view=auto
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java (added)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java Fri Aug 8 14:46:14 2008
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.commons.test;
+
+/**
+ * @author Leonardo Uribe
+ */
+
+public class CommonsValidatorTagLibTestCase extends AbstractTagLibTestCase
+{
+
+ protected static final String META_INF = "META-INF/";
+
+ public CommonsValidatorTagLibTestCase()
+ {
+ tldPaths = new String[1];
+ tldPaths[0] = META_INF + "mcv.tld";
+ }
+
+}
Propchange: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/commons/trunk/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/test/CommonsValidatorTagLibTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL