Seam SVN: r12305 - modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-03-26 21:27:39 -0400 (Fri, 26 Mar 2010)
New Revision: 12305
Added:
modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java
Log:
assign the alias "conversation" to the build-in Conversation bean
Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java
===================================================================
--- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java (rev 0)
+++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-03-27 01:27:39 UTC (rev 12305)
@@ -0,0 +1,21 @@
+package org.jboss.seam.faces.context.conversation;
+
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
+import javax.inject.Named;
+
+/**
+ * Exposes the {@link Conversation} under the simplified name "conversation"
+ * in addition to the default "javax.enterprise.context.conversation". This
+ * alias is provided for the page author's convenience.
+ *
+ * @author Dan Allen
+ */
+public class NamedConversationAliasProducer
+{
+ public @Produces @Named @Typed() Conversation getConversation(Conversation conversation)
+ {
+ return conversation;
+ }
+}
14 years, 9 months
Seam SVN: r12304 - modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-03-26 21:26:30 -0400 (Fri, 26 Mar 2010)
New Revision: 12304
Modified:
modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java
Log:
make serializable
Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java
===================================================================
--- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-27 00:35:35 UTC (rev 12303)
+++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-27 01:26:30 UTC (rev 12304)
@@ -3,6 +3,7 @@
*/
package org.jboss.seam.faces.context.conversation;
+import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -22,7 +23,7 @@
*/
@Begin
@Interceptor
-public class BeginConversationInterceptor
+public class BeginConversationInterceptor implements Serializable
{
@Inject
Logger log;
14 years, 9 months
Seam SVN: r12303 - build/trunk/parent.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-03-26 20:35:35 -0400 (Fri, 26 Mar 2010)
New Revision: 12303
Modified:
build/trunk/parent/pom.xml
Log:
add the slf4j-jdk14 implementation in runtime scope so that
a) a default is provided
b) JBoss AS doesn't barf on slf4j conflicts
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-03-26 16:34:39 UTC (rev 12302)
+++ build/trunk/parent/pom.xml 2010-03-27 00:35:35 UTC (rev 12303)
@@ -122,4 +122,19 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <!--
+ The reason slf4j-jdk14 is included at runtime scope is because
+ slf4j-api is compile scope and, without the JDK 1.4 bridge, JBoss AS
+ will barf. This should be included by weld-extensions to make it easy
+ to exclude if necessary.
+ -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
</project>
14 years, 9 months
Seam SVN: r12302 - branches/enterprise/JBPAPP_4_2_CP01.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-03-26 12:34:39 -0400 (Fri, 26 Mar 2010)
New Revision: 12302
Modified:
branches/enterprise/JBPAPP_4_2_CP01/build.xml
Log:
added java 6 argument for launching tests
Modified: branches/enterprise/JBPAPP_4_2_CP01/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_2_CP01/build.xml 2010-03-26 15:52:57 UTC (rev 12301)
+++ branches/enterprise/JBPAPP_4_2_CP01/build.xml 2010-03-26 16:34:39 UTC (rev 12302)
@@ -832,6 +832,8 @@
<testng>
<classpath refid="test.classpath"/>
<xmlfileset dir="${src.test.dir}" includes="**/*.xml"/>
+ <!--added for JDK6 compatibility with JBoss embedded-->
+ <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
</testng>
</target>
@@ -883,6 +885,8 @@
<classpath refid="${test.classpath}"/>
<classpath refid="example.classpath.emma"/>
<xmlfileset dir="${src.test.dir}" includes="**/*.xml"/>
+ <!--added for JDK6 compatibility with JBoss embedded-->
+ <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
</testng>
</target>
14 years, 9 months
Seam SVN: r12301 - branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples.
by seam-commits@lists.jboss.org
Author: kpiwko(a)redhat.com
Date: 2010-03-26 11:52:57 -0400 (Fri, 26 Mar 2010)
New Revision: 12301
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/build.xml
Log:
JBPAPP-4014
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/build.xml 2010-03-26 07:19:34 UTC (rev 12300)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/ftest/examples/build.xml 2010-03-26 15:52:57 UTC (rev 12301)
@@ -201,6 +201,7 @@
<classpath>
<pathelement location="${jboss.home}/bin/run.jar" />
</classpath>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed" />
<jvmarg line="${jboss.jvm.arguments}" />
<arg line="-c ${jboss.domain} -b ${jboss.host}" />
</java>
14 years, 9 months
Seam SVN: r12300 - in branches/community/Seam_2_2/src/test/ftest: examples/remoting/chatroom and 3 other directories.
by seam-commits@lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-03-26 03:19:34 -0400 (Fri, 26 Mar 2010)
New Revision: 12300
Added:
branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5-webdriver.xml
branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/
branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
Removed:
branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5.xml
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebDriverTest.java
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebElement.java
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java
Log:
JBSEAM-4610 remoting-chatroom example rewritten to webdriver
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2010-03-26 06:42:26 UTC (rev 12299)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2010-03-26 07:19:34 UTC (rev 12300)
@@ -76,7 +76,7 @@
<testexample name="openid" />
<testexample name="quartz" />
<testexample name="registration" />
- <testexample name="remoting/chatroom" />
+ <testexample name="remoting/chatroom" webdriver="true"/>
<testexample name="rss" />
<testexample name="seambay" webdriver="true"/>
<testexample name="seamdiscs" />
@@ -120,7 +120,7 @@
<testexample name="openid" />
<testexample name="quartz" />
<testexample name="registration" />
- <testexample name="remoting/chatroom" />
+ <testexample name="remoting/chatroom" webdriver="true"/>
<testexample name="remoting/helloworld" />
<testexample name="remoting/gwt" />
<testexample name="rss" />
Added: branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5-webdriver.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5-webdriver.xml (rev 0)
+++ branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5-webdriver.xml 2010-03-26 07:19:34 UTC (rev 12300)
@@ -0,0 +1,25 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2008, Red Hat
+ Middleware LLC, and individual contributors by the @authors tag. See
+ the copyright.txt in the distribution for a full listing of individual
+ contributors. This is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Web Driver Chatroom example" verbose="2" parallel="false">
+ <test name="chatroom_jboss5_webdriver">
+ <packages>
+ <package name="org.jboss.seam.example.remoting.chatroom.test.webdriver" />
+ </packages>
+ </test>
+</suite>
Deleted: branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5.xml 2010-03-26 06:42:26 UTC (rev 12299)
+++ branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/jboss5.xml 2010-03-26 07:19:34 UTC (rev 12300)
@@ -1,27 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual
- contributors. This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version. This software is
- distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not, write
- to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Chatroom example" verbose="2" parallel="false">
- <test name="chatroom_jboss5">
- <parameter name="PROPERTY_FILE" value="" />
- <classes>
- <class
- name="org.jboss.seam.example.remoting.chatroom.test.selenium.SeleniumChatroomTest" />
- </classes>
- </test>
-</suite>
Added: branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java (rev 0)
+++ branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java 2010-03-26 07:19:34 UTC (rev 12300)
@@ -0,0 +1,230 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.example.remoting.chatroom.test.webdriver;
+
+
+//import static junit.framework.Assert.assertTrue;
+
+import org.jboss.seam.example.common.test.webdriver.AjaxWebDriverFactory;
+import org.jboss.seam.example.common.test.webdriver.AjaxWebDriverTest;
+import org.jboss.seam.example.common.test.webdriver.AjaxWebElement;
+import org.jboss.seam.example.common.test.webdriver.AjaxWebDriver;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.NoSuchElementException;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.assertNull;
+import static org.testng.Assert.fail;
+
+/**
+ * This class tests functionality of remoting/chatroom example.
+ * The test opens two browsers and tests communication between users.
+ *
+ * @author Martin Gencur
+ *
+ */
+public class WebDriverChatroomTest extends AjaxWebDriverTest
+{
+ public static int timeout = 16000;
+
+ public static final String NAME1 = "Martin";
+ public static final String NAME2 = "Jozef";
+ public static final String MESSAGE_FROM_MARTIN = "Hello";
+ public static final String MESSAGE_FROM_JOZEF = "Good evening";
+ public static final String HOME_PAGE = "/chatroom.seam";
+
+ public static final String HOME_PAGE_TITLE = "Chat Room Example";
+ public static final By NAME_INPUT = By.id("username");
+ public static final By CONNECT_BUTTON = By.id("btnConnect");
+ public static final By DISCONNECT_BUTTON = By.id("btnDisconnect");
+ public static final By CONNECT_BUTTON_DISABLED = By.xpath("//input[@id='btnConnect'][@disabled]");
+ public static final By DISCONNECT_BUTTON_DISABLED = By.xpath("//input[@id='btnDisconnect'][@disabled]");
+ public static final By MESSAGE_INPUT = By.id("messageText");
+ public static final By CHAT_AREA = By.id("channelDisplay");
+ public static final By MARTIN_CONNECTED = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Martin connected.')]");
+ public static final By MARTIN_LISTED = By.xpath("//div/select[@id='userList']/option[contains(text(),'Martin')]");
+ public static final By JOZEF_CONNECTED = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Jozef connected.')]");
+ public static final By JOZEF_LISTED = By.xpath("//div/select[@id='userList']/option[contains(text(),'Jozef')]");
+ public static final By JOZEF_DISCONNECTED = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Jozef disconnected.')]");
+ public static final By MARTIN_GT = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Martin>')]");
+ public static final By HELLO = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'"+ MESSAGE_FROM_MARTIN +"')]");
+ public static final By JOZEF_GT = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Jozef>')]");
+ public static final By GOOD_MORNING = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'" + MESSAGE_FROM_JOZEF + "')]");
+
+ protected AjaxWebDriver driver2;
+
+ @BeforeMethod
+ public void setUp()
+ {
+ startSecondBrowser();
+ driver.get(serverURL + contextPath + HOME_PAGE);
+ driver2.get(serverURL + contextPath + HOME_PAGE);
+ }
+
+ @AfterMethod
+ public void tearDown()
+ {
+ stopSecondBrowser();
+ }
+
+ @Test
+ public void homePageLoadTest()
+ {
+ assertTrue("Unexpected page title.", driver.getTitle().contains(HOME_PAGE_TITLE));
+ }
+
+ @Test(dependsOnMethods={"homePageLoadTest"})
+ public void connectAndChatTest()
+ {
+ /*connect user to chat*/
+ connect();
+ /*verify that user is connected and is seen by other users*/
+ verifyConnecting();
+ /*exchange several messages*/
+ chat();
+ /*disconnect user from chat*/
+ disconnect();
+ /*verify that user is disconnected and is not in a list of users anymore*/
+ verifyDisconnecting();
+ }
+
+ public void connect()
+ {
+ driver.findElement(NAME_INPUT).clearAndSendKeys(NAME1);
+ driver.setWaitTime(timeout);
+ driver.findElement(CONNECT_BUTTON).clickAndWait();
+ }
+
+ public void verifyConnecting()
+ {
+ driver.findElement(MARTIN_LISTED);
+ driver2.setWaitTime(timeout);
+ driver2.findElement(NAME_INPUT).clearAndSendKeys(NAME2);
+ driver2.findElement(CONNECT_BUTTON).clickAndWait();
+ driver2.findElement(JOZEF_LISTED);
+ driver2.findElement(MARTIN_LISTED);
+ driver.findElement(JOZEF_CONNECTED);
+ driver.findElement(JOZEF_LISTED);
+ }
+
+ public void disconnect()
+ {
+ driver2.findElement(DISCONNECT_BUTTON).clickAndWait();
+ }
+
+ public void verifyDisconnecting()
+ {
+
+ AjaxWebElement el = null;
+ try
+ {
+ el = driver2.findElement(JOZEF_LISTED);
+ }
+ catch (NoSuchElementException e)
+ {
+ }
+ assertNull("Jozef should not be listed in second browser window", el);
+
+ driver2.findElement(DISCONNECT_BUTTON_DISABLED);
+ driver.findElement(JOZEF_DISCONNECTED);
+
+ AjaxWebElement el2 = null;
+ try
+ {
+ el2 = driver.findElement(JOZEF_LISTED);
+ }
+ catch (NoSuchElementException e)
+ {
+ }
+ assertNull("Jozef should not be listed in first browser window", el2);
+
+ driver.findElement(DISCONNECT_BUTTON).clickAndWait();
+
+ AjaxWebElement el3 = null;
+ try
+ {
+ el3 = driver.findElement(MARTIN_LISTED);
+ }
+ catch (NoSuchElementException e)
+ {
+ }
+ assertNull("Martin should not be listed in first browser window", el3);
+
+ driver.findElement(DISCONNECT_BUTTON_DISABLED);
+ }
+
+ public void chat()
+ {
+ /*first user is sending a message*/
+ driver.findElement(MESSAGE_INPUT).clearAndSendKeys(MESSAGE_FROM_MARTIN);
+ driver.findElement(MESSAGE_INPUT).sendKeys(Keys.RETURN);
+
+ try
+ {
+ Thread.sleep(timeout);
+ } catch (InterruptedException e)
+ {
+ }
+
+ driver.findElement(MARTIN_GT);
+ driver.findElement(HELLO);
+ driver2.findElement(MARTIN_GT);
+ driver2.findElement(HELLO);
+ driver2.findElement(MESSAGE_INPUT).clearAndSendKeys(MESSAGE_FROM_JOZEF, Keys.RETURN);
+
+ try
+ {
+ Thread.sleep(timeout);
+ } catch (InterruptedException e)
+ {
+ }
+
+ driver2.findElement(JOZEF_GT);
+ driver2.findElement(GOOD_MORNING);
+ driver.findElement(JOZEF_GT);
+ driver.findElement(GOOD_MORNING);
+ }
+
+ public void startSecondBrowser()
+ {
+ try
+ {
+ this.driver2 = AjaxWebDriverFactory.getDriver(this.browser);
+ }
+ catch (IllegalArgumentException e)
+ {
+ fail("Unable to instantiate browser of type: " + this.browser + ", available browsers are: " + AjaxWebDriverFactory.availableBrowsers());
+ }
+ catch (NullPointerException e)
+ {
+ fail("Unable to instantiate browser of type: " + this.browser + ", available browsers are: " + AjaxWebDriverFactory.availableBrowsers());
+ }
+ }
+
+ public void stopSecondBrowser()
+ {
+ driver2.close();
+ }
+}
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebDriverTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebDriverTest.java 2010-03-26 06:42:26 UTC (rev 12299)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebDriverTest.java 2010-03-26 07:19:34 UTC (rev 12300)
@@ -18,6 +18,7 @@
protected AjaxWebDriver driver;
protected String serverURL;
protected String contextPath;
+ protected String browser;
@BeforeMethod
@Parameters(value = {
@@ -40,6 +41,7 @@
this.serverURL = serverURL;
this.contextPath = contextPath;
+ this.browser = browser;
}
@AfterMethod
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebElement.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebElement.java 2010-03-26 06:42:26 UTC (rev 12299)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/AjaxWebElement.java 2010-03-26 07:19:34 UTC (rev 12300)
@@ -20,6 +20,8 @@
public void setWaitTime(int millis);
public void clickAndWait();
+
+ public void clickAndWait(int millis);
public void clearAndSendKeys(CharSequence... keysToSend);
}
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java 2010-03-26 06:42:26 UTC (rev 12299)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java 2010-03-26 07:19:34 UTC (rev 12300)
@@ -51,7 +51,15 @@
} catch (InterruptedException e) {
}
}
-
+
+ public void clickAndWait(int millis) {
+ element.click();
+ try {
+ Thread.sleep(millis);
+ } catch (InterruptedException e) {
+ }
+ }
+
//@Override
public AjaxWebElement findElement(By by) {
return new DelegatedWebElement(element.findElement(by));
14 years, 9 months
Seam SVN: r12299 - in modules/security/trunk/examples/seamspace/src/main/webapp: WEB-INF and 1 other directory.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-03-26 02:42:26 -0400 (Fri, 26 Mar 2010)
New Revision: 12299
Modified:
modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml
modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml
modules/security/trunk/examples/seamspace/src/main/webapp/index.html
Log:
minor
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml 2010-03-26 04:59:57 UTC (rev 12298)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml 2010-03-26 06:42:26 UTC (rev 12299)
@@ -5,7 +5,25 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>SeamSpace Example</display-name>
+
+ <!-- JSF -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
<!-- Content Servlet -->
<servlet>
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-26 04:59:57 UTC (rev 12298)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-26 06:42:26 UTC (rev 12299)
@@ -1,93 +1,93 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ template="/template.xhtml">
+
+ <ui:define name="content">
+ <div id="contentMain">
+ <h1>Welcome to seamspace!</h1>
+
+ <p>
+ This example project is an imitation of a popular social networking site, and has
+ been put together to demonstrate the various features of the Seam Security API.
+ </p>
+
+ <p><b>New!</b> You can now use the <h:link view="/hashgen.xhtml" value="Password Hash Generator"/>
+ page to generate password hashes for your own application.
+ </p>
+
+ </div>
- <ui:composition template="template.xhtml">
- <ui:define name="content">
- <div id="contentMain">
- <h1>Welcome to seamspace!</h1>
-
- <p>
- This example project is an imitation of a popular social networking site, and has
- been put together to demonstrate the various features of the Seam Security API.
- </p>
-
- <p><b>New!</b> You can now use the <s:link view="/hashgen.xhtml" value="Password Hash Generator"/>
- page to generate password hashes for your own application.
- </p>
-
- </div>
+ <div id="contentDivider">
+ </div>
- <div id="contentDivider">
- </div>
-
- <div id="contentSide">
- <div class="advertising"></div>
-
- <h:form id="loginForm" rendered="#{not identity.loggedIn}">
- <div class="memberLogin">
- <div class="loginHeader">Member Login</div>
-
- <h:messages id="messages" globalOnly="true"/>
-
- <div class="loginRow">
- <h:outputLabel for="name" value="Member name" styleClass="loginLabel"/>
- <h:inputText id="name" value="#{credentials.username}"/>
- </div>
-
- <div class="validationMsg">
- <h:message for="name"/>
- </div>
-
- <div class="loginRow">
- <h:outputLabel for="password" value="Password" styleClass="loginLabel"/>
- <h:inputSecret id="password" value="#{credentials.password}" redisplay="true"/>
- </div>
-
- <div class="validationMsg">
- <h:message for="password"/>
- </div>
-
- <div class="loginRow">
- <h:outputLabel for="rememberMe" value="Remember me" styleClass="loginLabel"/>
- <h:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/>
- </div>
-
- <div class="buttons">
- <h:commandButton id="login" value="LOGIN" action="#{identity.login}" styleClass="loginButton"/>
- <h:commandButton id="register" value="SIGN UP!" action="#{register.start}" styleClass="registerButton"/>
- </div>
-
- <br class="clear"/>
+ <div id="contentSide">
+ <div class="advertising"></div>
+
+ <h:form id="loginForm" rendered="#{not identity.loggedIn}">
+ <div class="memberLogin">
+ <div class="loginHeader">Member Login</div>
+ <h:messages id="messages" globalOnly="true"/>
+
+ <div class="loginRow">
+ <h:outputLabel for="name" value="Member name" styleClass="loginLabel"/>
+ <h:inputText id="name" value="#{credentials.username}"/>
</div>
- <span>Tip: You can log in using <b>demo/demo</b> as the username/password</span>
- </h:form>
-
- <div class="newMembers">
- <div class="newMembersHeader">Cool new members</div>
-
- <ui:repeat value="#{newMembers}" var="newMember">
- <div class="newMember">
+ <div class="validationMsg">
+ <h:message for="name"/>
+ </div>
+
+ <div class="loginRow">
+ <h:outputLabel for="password" value="Password" styleClass="loginLabel"/>
+ <h:inputSecret id="password" value="#{credentials.password}" redisplay="true"/>
+ </div>
+
+ <div class="validationMsg">
+ <h:message for="password"/>
+ </div>
+
+ <div class="loginRow">
+ <h:outputLabel for="rememberMe" value="Remember me" styleClass="loginLabel"/>
+ <h:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/>
+ </div>
- <s:link view="/profile.seam" propagation="none">
- <f:param name="name" value="#{newMember.memberName}"/>
- #{newMember.memberName}<br/>
- <h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/>
- </s:link>
-
- </div>
- </ui:repeat>
-
+ <div class="buttons">
+ <h:commandButton id="login" value="LOGIN" action="#{identity.login}" styleClass="loginButton"/>
+ <h:commandButton id="register" value="SIGN UP!" action="#{register.start}" styleClass="registerButton"/>
+ </div>
+
<br class="clear"/>
+
</div>
+
+ <span>Tip: You can log in using <b>demo/demo</b> as the username/password</span>
+ </h:form>
+
+ <div class="newMembers">
+ <div class="newMembersHeader">Cool new members</div>
+
+ <ui:repeat value="#{newMembers}" var="newMember">
+ <div class="newMember">
+
+ <h:link view="/profile.seam" propagation="none">
+ <f:param name="name" value="#{newMember.memberName}"/>
+ #{newMember.memberName}<br/>
+ <h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/>
+ </h:link>
+
+ </div>
+ </ui:repeat>
+
+ <br class="clear"/>
</div>
-
- </ui:define>
-
- </ui:composition>
-</html>
+ </div>
+
+ </ui:define>
+
+</ui:composition>
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/index.html
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/index.html 2010-03-26 04:59:57 UTC (rev 12298)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/index.html 2010-03-26 06:42:26 UTC (rev 12299)
@@ -1,5 +1,5 @@
<html>
<head>
- <meta http-equiv="Refresh" content="0; URL=home.seam">
+ <meta http-equiv="Refresh" content="0; URL=home.jsf">
</head>
</html>
\ No newline at end of file
14 years, 9 months
Seam SVN: r12298 - modules/drools/trunk.
by seam-commits@lists.jboss.org
Author: tsurdilovic
Date: 2010-03-26 00:59:57 -0400 (Fri, 26 Mar 2010)
New Revision: 12298
Removed:
modules/drools/trunk/.settings/
Log:
deleted
14 years, 9 months
Seam SVN: r12297 - modules/drools/trunk/core.
by seam-commits@lists.jboss.org
Author: tsurdilovic
Date: 2010-03-26 00:59:34 -0400 (Fri, 26 Mar 2010)
New Revision: 12297
Removed:
modules/drools/trunk/core/.project
Log:
deleted
Deleted: modules/drools/trunk/core/.project
===================================================================
--- modules/drools/trunk/core/.project 2010-03-26 04:58:57 UTC (rev 12296)
+++ modules/drools/trunk/core/.project 2010-03-26 04:59:34 UTC (rev 12297)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>seam-drools-core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
14 years, 9 months
Seam SVN: r12296 - modules/drools/trunk/docs.
by seam-commits@lists.jboss.org
Author: tsurdilovic
Date: 2010-03-26 00:58:57 -0400 (Fri, 26 Mar 2010)
New Revision: 12296
Removed:
modules/drools/trunk/docs/.classpath
modules/drools/trunk/docs/.project
Log:
deleted
Deleted: modules/drools/trunk/docs/.classpath
===================================================================
--- modules/drools/trunk/docs/.classpath 2010-03-26 04:58:26 UTC (rev 12295)
+++ modules/drools/trunk/docs/.classpath 2010-03-26 04:58:57 UTC (rev 12296)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: modules/drools/trunk/docs/.project
===================================================================
--- modules/drools/trunk/docs/.project 2010-03-26 04:58:26 UTC (rev 12295)
+++ modules/drools/trunk/docs/.project 2010-03-26 04:58:57 UTC (rev 12296)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>seam-drools-reference-guide</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
14 years, 9 months