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/09 22:12:34 UTC
svn commit: r684327 - in /myfaces/commons/branches/jsf_11:
myfaces-commons-converters/pom.xml myfaces-commons-examples/pom.xml
myfaces-commons-utils/pom.xml myfaces-commons-validators/pom.xml pom.xml
Author: lu4242
Date: Sat Aug 9 13:12:34 2008
New Revision: 684327
URL: http://svn.apache.org/viewvc?rev=684327&view=rev
Log:
format poms.xml and add dependencies as 1.2 branch
Modified:
myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-examples/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml
myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_11/pom.xml
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml?rev=684327&r1=684326&r2=684327&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-converters/pom.xml Sat Aug 9 13:12:34 2008
@@ -113,107 +113,54 @@
</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>
- <jsfVersion>1.1</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-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>
- <version>1.0.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -237,36 +184,38 @@
<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>
+
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-examples/pom.xml?rev=684327&r1=684326&r2=684327&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-examples/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-examples/pom.xml Sat Aug 9 13:12:34 2008
@@ -17,80 +17,80 @@
-->
<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>
+ <parent>
+ <artifactId>commons</artifactId>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <version>1.1.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.1.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.1.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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </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>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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </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>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml?rev=684327&r1=684326&r2=684327&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-utils/pom.xml Sat Aug 9 13:12:34 2008
@@ -27,6 +27,22 @@
<packaging>jar</packaging>
<name>Apache MyFaces Commons Utils</name>
+ <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>
@@ -44,5 +60,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml?rev=684327&r1=684326&r2=684327&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-validators/pom.xml Sat Aug 9 13:12:34 2008
@@ -120,70 +120,6 @@
</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.1</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>
@@ -221,6 +157,15 @@
<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>
@@ -285,5 +230,12 @@
<artifactId>jmock-cglib</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: myfaces/commons/branches/jsf_11/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/pom.xml?rev=684327&r1=684326&r2=684327&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/pom.xml (original)
+++ myfaces/commons/branches/jsf_11/pom.xml Sat Aug 9 13:12:34 2008
@@ -17,12 +17,13 @@
-->
<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</groupId>
<artifactId>myfaces</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<groupId>org.apache.myfaces.commons</groupId>
@@ -58,7 +59,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!--
+ - Make a checkstyle violation a compile error. Note that if a compile error occurs,
+ - further information can be found in target/site/checkstyle.html (present even when
+ - just the compile goal and not the site goal has been run). Note also that child
+ - projects may redeclare this plugin and provide different configuration settings
+ - to use different checks (more or less strict than the default).
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>verify-style</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configLocation>default/myfaces-checks-minimal.xml</configLocation>
+ <headerLocation>default/myfaces-header.txt</headerLocation>
+ </configuration>
+ </plugin>
</plugins>
+
<pluginManagement>
<plugins>
<plugin>
@@ -184,7 +211,12 @@
<version>1.0.1</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -252,4 +284,18 @@
</build>
</profile>
</profiles>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <configLocation>default/myfaces-checks-normal.xml</configLocation>
+ <headerLocation>default/myfaces-header-spaces.txt</headerLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>