You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/07/07 19:12:03 UTC
svn commit: r961434 - /myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml
Author: mfreedman
Date: Wed Jul 7 17:12:03 2010
New Revision: 961434
URL: http://svn.apache.org/viewvc?rev=961434&view=rev
Log:
Merged various changes from the 301 TCK, including new client submodule and module name changes.
Modified:
myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml
Modified: myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml?rev=961434&r1=961433&r2=961434&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/pom.xml Wed Jul 7 17:12:03 2010
@@ -2,9 +2,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-testsuite-master</artifactId>
+ <artifactId>portlet-bridge-tck</artifactId>
<packaging>pom</packaging>
- <name>MyFaces Portlet Bridge Test Suite Master</name>
+ <name>MyFaces Portlet Bridge Test Suite</name>
<version>2.0.0-SNAPSHOT</version>
<inceptionYear>2010</inceptionYear>
<description>
@@ -23,14 +23,6 @@
<version>3</version>
</parent>
- <modules>
- <module>portlet-bridge-testsuite-main</module>
- <module>portlet-bridge-testsuite-section3-2-lifecycle-set</module>
- <module>portlet-bridge-testsuite-section3-2-render-policy-always-delegate</module>
- <module>portlet-bridge-testsuite-section3-2-render-policy-never-delegate</module>
- <module>portlet-bridge-testsuite-section3-2-render-policy-default</module>
- </modules>
-
<properties>
<!-- Specification Configurations -->
<servlet.version>2.5</servlet.version>
@@ -72,20 +64,20 @@
<junit.version>4.7</junit.version>
<!-- TCK Test Application Configuration -->
- <bridge.tck.test.file.stylesheet>${basedir}/../src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
- <bridge.tck.test.file.dir>${project.build.directory}/generated-resources/xml/xslt</bridge.tck.test.file.dir>
- <bridge.tck.test.file.name>test.xml</bridge.tck.test.file.name>
- <bridge.tck.test.host>localhost</bridge.tck.test.host>
- <bridge.tck.test.port>8080</bridge.tck.test.port>
<bridge.tck.test.path>${project.artifactId}/pluto/index.jsp?portlet=</bridge.tck.test.path>
- <bridge.tck.test.filter></bridge.tck.test.filter>
+ <bridge.tck.test.filter/>
<!-- TCK Test Harness Configuration -->
- <bridge.tck.host>localhost</bridge.tck.host>
- <bridge.tck.port>4444</bridge.tck.port>
+ <bridge.tck.selenium.host>localhost</bridge.tck.selenium.host>
+ <bridge.tck.selenium.port>4444</bridge.tck.selenium.port>
<bridge.tck.browser>*firefox</bridge.tck.browser>
- <bridge.tck.login-file></bridge.tck.login-file>
+ <bridge.tck.login-file/>
+ <bridge.tck.test.file.dir>${project.build.directory}/generated-resources/xml/xslt</bridge.tck.test.file.dir>
+ <bridge.tck.test.file.name>test.xml</bridge.tck.test.file.name>
+ <bridge.tck.test.file>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</bridge.tck.test.file>
+ <bridge.tck.test.exclusions.file>../src/test/resources/test-exclusions.xml</bridge.tck.test.exclusions.file>
+ <bridge.tck.test.file.stylesheet>${basedir}/../src/test/resources/test.xsl</bridge.tck.test.file.stylesheet>
</properties>
<!-- issueManagement is in parent -->
@@ -95,18 +87,33 @@
<!-- contributors are in parent -->
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk_2.0.x/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/testsuite/trunk_2.0.x/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/testsuite/trunk_2.0.x/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/portlet-bridge/tck/trunk_2.0.x/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/portlet-bridge/tck/trunk_2.0.x/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/portlet-bridge/tck/trunk_2.0.x/</url>
</scm>
<distributionManagement>
<site>
<id>apache-site</id>
- <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/testsuite</url>
+ <url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/tck</url>
</site>
</distributionManagement>
-
+
+ <repositories>
+ <repository>
+ <id>maven1-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -243,7 +250,9 @@
</plugins>
<pluginManagement>
+ <!-- This section will be inherited by all sub modules -->
<plugins>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
@@ -253,13 +262,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <!--<property>
- <name>bridge.tck.client.base.url</name>
- <value>${bridge.tck.base-url}</value>
- </property>-->
<property>
<name>bridge.tck.test.file</name>
- <value>${bridge.tck.test.file.dir}/${bridge.tck.test.file.name}</value>
+ <value>${bridge.tck.test.file}</value>
+ </property>
+ <property>
+ <name>bridge.tck.test.exclusions.file</name>
+ <value>${bridge.tck.test.exclusions.file}</value>
</property>
<property>
<name>bridge.tck.test.base-url</name>
@@ -269,6 +278,18 @@
<name>bridge.tck.login.file</name>
<value>${bridge.tck.login-file}</value>
</property>
+ <property>
+ <name>bridge.tck.selenium.host</name>
+ <value>${bridge.tck.selenium.host}</value>
+ </property>
+ <property>
+ <name>bridge.tck.selenium.port</name>
+ <value>${bridge.tck.selenium.port}</value>
+ </property>
+ <property>
+ <name>bridge.tck.browser</name>
+ <value>${bridge.tck.browser}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -283,24 +304,117 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
- <contextPath>/${project.artifactId}</contextPath>
- <!--<webAppConfig>
- <contextPath>/${project.artifactId}</contextPath>
- <defaultsDescriptor>${basedir}/../src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</defaultsDescriptor>
- <overrideDescriptor>${project.build.directory}/pluto-resources/web.xml</overrideDescriptor>
- </webAppConfig>-->
+ <contextPath>/${project.artifactId}</contextPath>
<webDefaultXml>${basedir}/../src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>${bridge.tck.test.port}</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
<stopPort>9966</stopPort>
<stopKey>foo</stopKey>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${basedir}/src/main/webapp/WEB-INF</dir>
+ <includes>
+ <include>portlet.xml</include>
+ </includes>
+ <outputDir>${bridge.tck.test.file.dir}</outputDir>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+ <targetName>${bridge.tck.test.file.name}</targetName>
+ </fileMapper>
+ </fileMappers>
+ <parameters>
+ <parameter>
+ <name>page-path</name>
+ <value>${bridge.tck.test.path}</value>
+ </parameter>
+ </parameters>
+ <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
+
+ <profile>
+ <id>include-war-modules</id>
+ <activation>
+ <property>
+ <name>!tck.external-server</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>portlet-bridge-tck-main</module>
+ <module>portlet-bridge-tck-section3-2-lifecycle-set</module>
+<!-- Render Policy tests are excluded because its mechanism relies on a Mojarra impl dependency (doesn't work on MyFaces)
+ If you are testing with Mojarra uncomment these out to get the additional test apps built
+
+ <module>portlet-bridge-tck-section3-2-render-policy-always-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-never-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-default</module>
+-->
+ </modules>
+ </profile>
+
+ <!-- Render Policy tests are excluded because its mechanism relies on a Mojarra impl dependency
+ (doesn't work on MyFaces) yet if you are testing with Mojarra uncomment these out to get the
+ additional test apps built-->
+ <profile>
+
+ <id>include-render-policy-tests</id>
+ <modules>
+ <module>portlet-bridge-tck-section3-2-render-policy-always-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-never-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-default</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>include-external-server-module</id>
+ <activation>
+ <property>
+ <name>tck.external-server</name>
+ </property>
+ </activation>
+
+ <properties>
+ <maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <bridge.tck.home>.</bridge.tck.home>
+ </properties>
+
+ <modules>
+ <module>portlet-bridge-tck-client</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>tck-default</id>
<activation>
@@ -311,6 +425,8 @@
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
+ <bridge.tck.test.host>localhost</bridge.tck.test.host>
+ <bridge.tck.test.port>8080</bridge.tck.test.port>
</properties>
<dependencies>
@@ -378,10 +494,10 @@
</profile>
- <profile>
+<!-- <profile>-->
<!-- Using this profile the TCK acts as a client only, so only the test
and selenium plugins are used.-->
- <id>tck-client-only</id>
+<!-- <id>tck-client-only</id>
<activation>
<property>
<name>tck.generate-war</name>
@@ -405,14 +521,14 @@
</plugins>
</build>
</profile>
-
+ -->
<!-- Generates a war file to work in a Pluto 1.x environment -->
<profile>
<id>tck-war-pluto</id>
<activation>
<property>
<name>tck.generate-war</name>
- <value>pluto</value>
+ <value>pluto1.0</value>
</property>
</activation>
@@ -482,7 +598,7 @@
<id>jsf-myfaces</id>
<activation>
<property>
- <name>jsf</name>
+ <name>includeJSF</name>
<value>myfaces</value>
</property>
</activation>
@@ -504,7 +620,8 @@
<id>jsf-include</id>
<activation>
<property>
- <name>jsf</name>
+ <name>includeJSF</name>
+ <value>mojarra</value>
</property>
</activation>
@@ -534,7 +651,6 @@
<activation>
<property>
<name>includeBridge</name>
- <value>!false</value>
</property>
</activation>
<dependencies>
@@ -561,8 +677,14 @@
</property>
</activation>
<modules>
- <module>assembly</module>
+ <module>portlet-bridge-tck-main</module>
+ <module>portlet-bridge-tck-section3-2-lifecycle-set</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-always-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-never-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-default</module>
+ <module>portlet-bridge-tck-client</module>
</modules>
+
<build>
<plugins>
<plugin>
@@ -584,7 +706,12 @@
</property>
</activation>
<modules>
- <module>assembly</module>
+ <module>portlet-bridge-tck-main</module>
+ <module>portlet-bridge-tck-section3-2-lifecycle-set</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-always-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-never-delegate</module>
+ <module>portlet-bridge-tck-section3-2-render-policy-default</module>
+ <module>portlet-bridge-tck-client</module>
</modules>
<build>
<plugins>