You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/06/17 18:18:30 UTC
svn commit: r785701 - in /myfaces/tobago/trunk/example/test: ./
src/main/java/org/apache/myfaces/tobago/example/test/ src/main/webapp/
src/main/webapp/WEB-INF/ src/main/webapp/tc/
src/test/java/org/apache/myfaces/tobago/example/test/
Author: lofwyr
Date: Wed Jun 17 16:18:30 2009
New Revision: 785701
URL: http://svn.apache.org/viewvc?rev=785701&view=rev
Log:
TOBAGO-765: syncing with branch 1.0.x
Added:
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (contents, props changed)
- copied, changed from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/PageItem.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/PageItem.java
myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml (contents, props changed)
- copied, changed from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/navi.xhtml
myfaces/tobago/trunk/example/test/src/main/webapp/tc/ (props changed)
- copied from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/tc/
myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java
myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java
myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/Parameterized.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/Parameterized.java
myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java (props changed)
- copied unchanged from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
Modified:
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/example/test/src/main/webapp/index.html
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=785701&r1=785700&r2=785701&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Wed Jun 17 16:18:30 2009
@@ -280,13 +280,16 @@
<port>8080</port>
</connector>
</connectors>
+ <!-- XXX what is a good name for stopKey? -->
+ <stopKey>foo</stopKey>
+ <stopPort>9999</stopPort>
</configuration>
<executions>
<execution>
<id>start-jetty</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run</goal>
+ <goal>run-exploded</goal>
</goals>
<configuration>
<daemon>true</daemon>
@@ -300,7 +303,6 @@
</goals>
</execution>
</executions>
-
</plugin>
Propchange: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java?p2=myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java&p1=myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java&r1=785648&r2=785701&rev=785701&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (original)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java Wed Jun 17 16:18:30 2009
@@ -37,6 +37,7 @@
"/index.html",
"/navi.xhtml",
"/org/apache/myfaces/tobago/renderkit/html/standard/blank.html",
+ "/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/dojo/.*",
"/tc/button/plain.html",
"/tc/button/plain_de.html"));
Propchange: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/PageItem.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/index.html?rev=785701&r1=785700&r2=785701&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/index.html (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/index.html Wed Jun 17 16:18:30 2009
@@ -3,7 +3,7 @@
<HEAD>
<TITLE>Tobago Test Page</TITLE>
</HEAD>
-<FRAMESET COLS="30%,70%">
+<FRAMESET COLS="320,70%">
<FRAME SRC="faces/navi.xhtml" NAME="navi">
<FRAME NAME="test">
</FRAMESET>
Copied: myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml (from r785648, myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/navi.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml?p2=myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml&p1=myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/navi.xhtml&r1=785648&r2=785701&rev=785701&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/test/src/main/webapp/navi.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml Wed Jun 17 16:18:30 2009
@@ -14,7 +14,11 @@
<tc:sheet value="#{browser.list}" columns="*" var="item" rows="1000">
<tc:column label="Test Pages">
+ <tc:link link="#{item.resource}" label="#{item.label}" target="test"/>
+<!--
+todo: this will work in later versions
<tc:link resource="#{item.resource}" jsfResource="#{item.jsfResource}" label="#{item.label}" target="test"/>
+-->
</tc:column>
</tc:sheet>
Propchange: myfaces/tobago/trunk/example/test/src/main/webapp/navi.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/main/webapp/tc/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/Parameterized.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: myfaces/tobago/trunk/example/test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
------------------------------------------------------------------------------
svn:mergeinfo =