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 2012/01/04 23:25:25 UTC
svn commit: r1227363 - in /myfaces/portlet-bridge/tck/trunk_3.0.x: pom.xml
portlet-bridge-tck-client/pom.xml
src/test/resources/pluto-portal-driver-config.xsl
src/test/resources/test-template.xsl
Author: mfreedman
Date: Wed Jan 4 22:25:25 2012
New Revision: 1227363
URL: http://svn.apache.org/viewvc?rev=1227363&view=rev
Log:
Modified TCK to run/work with the refactored JSF 3.0.0 branch
Modified:
myfaces/portlet-bridge/tck/trunk_3.0.x/pom.xml
myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-client/pom.xml
myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/pluto-portal-driver-config.xsl
myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/test-template.xsl
Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/pom.xml?rev=1227363&r1=1227362&r2=1227363&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/pom.xml Wed Jan 4 22:25:25 2012
@@ -92,6 +92,7 @@
<pluto.version>1.1.7</pluto.version>
<selenium.version>1.0.1</selenium.version>
<junit.version>4.7</junit.version>
+ <slf4j.version>1.6.2</slf4j.version>
<!-- TCK Test Application Configuration -->
<bridge.tck.test.path>${project.artifactId}/pluto/index.jsp?portlet=</bridge.tck.test.path>
@@ -675,6 +676,14 @@
<artifactId>jstl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>${trinidad.groupId}</groupId>
<artifactId>${trinidad.api.artifactId}</artifactId>
Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-client/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-client/pom.xml?rev=1227363&r1=1227362&r2=1227363&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-client/pom.xml (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/portlet-bridge-tck-client/pom.xml Wed Jan 4 22:25:25 2012
@@ -124,11 +124,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <!-- Generates a test.xml file by applying a stylesheet to one or
+ more portlet definition files. -->
<configuration>
<transformationSets>
<transformationSet>
<dir>../portlet-bridge-tck-main/src/main/webapp/WEB-INF</dir>
<includes>
+ <!-- Stylesheet applied to this portlet definition. -->
<include>portlet.xml</include>
</includes>
<outputDir>${bridge.tck.test.file.dir}</outputDir>
@@ -139,15 +142,16 @@
</fileMappers>
<parameters>
<parameter>
+ <!-- Additional stylesheet parameter to generate servlet
+ path strings -->
<name>page-path</name>
<value>${bridge.tck.test.file.servlet.path}</value>
</parameter>
<parameter>
+ <!-- Additional stylesheet parameter defines an addtional
+ portlet definition to be transformed. -->
<name>portlet-def-1-xml</name>
- <!-- Using a relative path which points to the parent
- directory leads to a bug during the transform, hence
- the local copy of the portlet definition file -->
- <value>lifecycle-portlet.xml</value>
+ <value>${project.baseUri}/../portlet-bridge-tck-section3-2-lifecycle-set/src/main/webapp/WEB-INF/portlet.xml</value>
</parameter>
</parameters>
<stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
@@ -178,11 +182,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <!-- Generates an xml file by applying a stylesheet to one or
+ more portlet definition files. -->
<configuration>
<transformationSets>
<transformationSet>
<dir>../portlet-bridge-tck-main/src/main/webapp/WEB-INF</dir>
<includes>
+ <!-- Stylesheet applied to this portlet definition. -->
<include>portlet.xml</include>
</includes>
<outputDir>${bridge.tck.test.file.dir}</outputDir>
@@ -194,18 +201,17 @@
<parameters>
<parameter>
<name>main-portlet-context</name>
- <value>portlet-bridge-tck-main-${version}</value>
+ <value>portlet-bridge-tck-main-${project.version}</value>
</parameter>
<parameter>
<name>extra-portlet-def</name>
- <!-- Using a relative path which points to the parent
- directory leads to a bug during the transform, hence
- the local copy of the portlet definition file -->
- <value>lifecycle-portlet.xml</value>
+ <!-- Stylesheet parameter defines an addtional portlet
+ definition to be transformed. -->
+ <value>${project.baseUri}/../portlet-bridge-tck-section3-2-lifecycle-set/src/main/webapp/WEB-INF/portlet.xml</value>
</parameter>
<parameter>
<name>extra-portlet-context</name>
- <value>portlet-bridge-tck-section3-2-lifecycle-set-${version}</value>
+ <value>portlet-bridge-tck-section3-2-lifecycle-set-${project.version}</value>
</parameter>
</parameters>
<stylesheet>${bridge.tck.pluto.config.xsl}</stylesheet>
Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/pluto-portal-driver-config.xsl
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/pluto-portal-driver-config.xsl?rev=1227363&r1=1227362&r2=1227363&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/pluto-portal-driver-config.xsl (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/pluto-portal-driver-config.xsl Wed Jan 4 22:25:25 2012
@@ -69,7 +69,7 @@
<xsl:template match="pa:portlet-app/pa:portlet[pa:portlet-info/pa:title = 'chapter3Tests-lifecycleTest-portlet - LIFECYCLE IMPLEMENTATION CLASS SET']">
<xsl:element name="page">
- <xsl:attribute name="name">TestPage141</xsl:attribute>
+ <xsl:attribute name="name">TestPage001a</xsl:attribute>
<xsl:attribute name="uri">/WEB-INF/themes/pluto-default-theme.jsp</xsl:attribute>
<xsl:element name="portlet">
<xsl:attribute name="context">/<xsl:value-of select='$extra-portlet-context'/></xsl:attribute>
Modified: myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/test-template.xsl
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/test-template.xsl?rev=1227363&r1=1227362&r2=1227363&view=diff
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/test-template.xsl (original)
+++ myfaces/portlet-bridge/tck/trunk_3.0.x/src/test/resources/test-template.xsl Wed Jan 4 22:25:25 2012
@@ -44,5 +44,11 @@
<xsl:value-of select="substring-before(substring-after(pa:portlet-name,'-'),'-')"/>
</xsl:element>
</xsl:template>
+ <xsl:template match="pa:portlet-app/pa:portlet[pa:portlet-info/pa:title='chapter3Tests-lifecycleTest-portlet - LIFECYCLE IMPLEMENTATION CLASS SET']" priority="2">
+ <xsl:element name="entry">
+ <xsl:attribute name="key"><xsl:value-of select='$page-path'/>001a</xsl:attribute>
+ <xsl:value-of select="substring-before(substring-after(pa:portlet-name,'-'),'-')"/>
+ </xsl:element>
+ </xsl:template>
<xsl:template match="text()|@*"/>
</xsl:stylesheet>