1:06 p.m.
Author: lfryc(a)redhat.com
Date: 2010-07-10 14:06:22 -0400 (Sat, 10 Jul 2010)
New Revision: 17812
Added:
root/tests/metamer/trunk/src/main/assembly/
root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml
Modified:
root/tests/metamer/trunk/pom.xml
Log:
https://jira.jboss.org/jira/browse/RFPL-466
pom.xml refactored to create binaries for JBoss and Tomcat
Modified: root/tests/metamer/trunk/pom.xml
===================================================================
--- root/tests/metamer/trunk/pom.xml 2010-07-10 18:05:56 UTC (rev 17811)
+++ root/tests/metamer/trunk/pom.xml 2010-07-10 18:06:22 UTC (rev 17812)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>examples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <!-- <parent>-->
+ <!-- <artifactId>examples</artifactId>-->
+ <!-- <groupId>org.richfaces</groupId>-->
+ <!-- <version>4.0.0-SNAPSHOT</version>-->
+ <!-- </parent>-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.testapps</groupId>
<artifactId>testapp</artifactId>
<packaging>war</packaging>
<name>RichFaces Testing Application</name>
+ <version>4.0.0-SNAPSHOT</version>
<repositories>
<repository>
@@ -39,66 +39,96 @@
</repository>
</repositories>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.richfaces.ui.components</groupId>
<artifactId>core-ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
-
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.9</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.2-b10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.0.2-b10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.11</version>
+ <type>jar</type>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.11</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.11</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.2.GA</version>
+ <type>jar</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
- <version>4.0.0-SNAPSHOT</version>
<build>
- <finalName>testapp</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/tomcat6-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>jee5</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
-
<webappDirectory>${project.build.directory}/${project.build.finalName}-jee5</webappDirectory>
- <classifier>jee5</classifier>
-
<packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes>
-
<warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classifier>tomcat6</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jee5</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
-
<webappDirectory>${project.build.directory}/${project.build.finalName}-jee5</webappDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Added: root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml
===================================================================
--- root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml
(rev 0)
+++ root/tests/metamer/trunk/src/main/assembly/tomcat6-assembly.xml 2010-07-10 18:06:22
UTC (rev 17812)
@@ -0,0 +1,55 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl...
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p...
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>tomcat6</id>
+
+ <formats>
+ <format>war</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>/WEB-INF/.faces-config.xml.jsfdia</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
+ </fileSet>
+ <fileSet>
+
<outputDirectory>META-INF/maven/${groupId}/${artifactId}</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-archiver</directory>
+
<outputDirectory>META-INF/maven/${groupId}/${artifactId}</outputDirectory>
+ <includes>
+ <include>pom.properties</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <excludes>
+ <exclude>org.slf4j:slf4j-jcl</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <scope>provided</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file