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:19:42 UTC

svn commit: r961436 - in /myfaces/portlet-bridge/tck/trunk_2.0.x: portlet-bridge-tck-client/ portlet-bridge-tck-main/ portlet-bridge-tck-section3-2-lifecycle-set/ portlet-bridge-tck-section3-2-render-policy-always-delegate/ portlet-bridge-tck-section3-...

Author: mfreedman
Date: Wed Jul  7 17:19:41 2010
New Revision: 961436

URL: http://svn.apache.org/viewvc?rev=961436&view=rev
Log:
Renamed directories to be consistent with the 301 TCK.

Added:
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/lifecycle-portlet.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/pom.xml
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-main/
      - copied from r961433, myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-main/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section3-2-lifecycle-set/
      - copied from r961433, myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section3-2-render-policy-always-delegate/
      - copied from r961433, myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section3-2-render-policy-default/
      - copied from r961433, myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-section3-2-render-policy-never-delegate/
      - copied from r961433, myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/
Removed:
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-main/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-lifecycle-set/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-always-delegate/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-default/
    myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-testsuite-section3-2-render-policy-never-delegate/

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/lifecycle-portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/lifecycle-portlet.xml?rev=961436&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/lifecycle-portlet.xml (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/lifecycle-portlet.xml Wed Jul  7 17:19:41 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<portlet-app version="1.0"
+             xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+
+    <portlet>
+        <portlet-name>chapter3Tests-lifecycleTest-portlet</portlet-name>
+        <portlet-class>org.apache.myfaces.portlet.faces.testsuite.common.portlet.GenericFacesTestSuitePortlet</portlet-class>
+
+        <init-param>
+          <name>javax.portlet.faces.defaultViewId.view</name>
+          <value>/tests/SingleRequestTest.jsp</value>
+        </init-param>
+
+        <expiration-cache>0</expiration-cache>
+
+       <supports>
+         <mime-type>text/html</mime-type>
+       </supports>
+        <portlet-info>
+                <title>chapter3Tests-lifecycleTest-portlet - LIFECYCLE IMPLEMENTATION CLASS SET</title>
+        </portlet-info>
+    </portlet>
+
+</portlet-app>

Added: myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/pom.xml?rev=961436&view=auto
==============================================================================
--- myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/pom.xml (added)
+++ myfaces/portlet-bridge/tck/trunk_2.0.x/portlet-bridge-tck-client/pom.xml Wed Jul  7 17:19:41 2010
@@ -0,0 +1,162 @@
+<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>
+  
+  <groupId>org.apache.myfaces.portlet-bridge</groupId>
+  <artifactId>portlet-bridge-tck-client</artifactId>
+  <packaging>jar</packaging>
+  <name>MyFaces Portlet Bridge Test Suite Client</name>
+  <inceptionYear>2007</inceptionYear>  
+  <description>
+  
+  </description>
+  
+  <parent>
+    <artifactId>portlet-bridge-tck</artifactId>
+    <groupId>org.apache.myfaces.portlet-bridge</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  
+  <profiles>
+    <profile>
+      <id>run-test</id>
+      <activation>
+        <property>
+          <name>tck.external-server</name>
+          <value>run-test</value>
+        </property>
+      </activation>
+     
+      <build>
+        <plugins>      
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>1.3</version>
+            <executions>
+              <execution>
+                <id>add-tck-source</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${basedir}/../src/test/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>test</phase>
+                <configuration>
+                  <tasks>
+                    <delete dir="../target/site" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+    
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>selenium-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <configuration>
+                <outputName>${artifactId}-report</outputName>
+                <outputDirectory>./target</outputDirectory>
+              </configuration>
+            </plugin>
+
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>selenium-maven-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>start</id>
+                  <phase>process-test-classes</phase>
+                  <goals>
+                    <goal>start-server</goal>
+                  </goals>
+                  <configuration>
+                    <background>true</background>
+                    <logOutput>true</logOutput>
+                    <multiWindow>true</multiWindow>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+     
+    <profile>
+      <id>generate-test-file-only</id>
+      <activation>
+        <property>
+          <name>tck.external-server</name>
+          <value>generate-test-file-template</value>
+        </property>
+      </activation>
+
+      <properties>
+        <maven.skip.tests>true</maven.skip.tests>
+        <bridge.tck.test.file.stylesheet>../src/test/resources/test-template.xsl</bridge.tck.test.file.stylesheet>
+        <bridge.tck.test.file.servlet.path>page-servlet-path</bridge.tck.test.file.servlet.path>
+      </properties>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xml-maven-plugin</artifactId>
+            <configuration>
+              <transformationSets>
+                <transformationSet>
+                  <dir>../portlet-bridge-tck-main/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.file.servlet.path}</value>
+                    </parameter>
+                    <parameter>
+                      <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>
+                    </parameter>
+                  </parameters>
+                  <stylesheet>${bridge.tck.test.file.stylesheet}</stylesheet>
+                </transformationSet>
+              </transformationSets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>