Seam SVN: r15622 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-21 17:22:34 -0400 (Mon, 21 Oct 2013)
New Revision: 15622
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
Log:
removed snappy-java.jar from eclipse .classpath of seam-gen generated project
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-10-21 12:34:25 UTC (rev 15621)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-10-21 21:22:34 UTC (rev 15622)
@@ -243,7 +243,6 @@
<classpathentry kind="lib" path="lib/sac.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api.jar"/>
<classpathentry kind="lib" path="lib/snakeyaml.jar"/>
- <classpathentry kind="lib" path="lib/snappy-java.jar"/>
<classpathentry kind="lib" path="lib/solr-analysis-extras.jar"/>
<classpathentry kind="lib" path="lib/solr-core.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj.jar"/>
10 years, 7 months
- 1
- 0
Seam SVN: r15621 - branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-21 08:34:25 -0400 (Mon, 21 Oct 2013)
New Revision: 15621
Modified:
branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml
Log:
https://issues.jboss.org/browse/WFK2-238 fixed wrong jboss-ejb3.xml schema and version
Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml 2013-10-21 12:17:24 UTC (rev 15620)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml 2013-10-21 12:34:25 UTC (rev 15621)
@@ -3,10 +3,10 @@
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-2_0.xsd
- http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
+ http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
xmlns:jee="http://java.sun.com/xml/ns/javaee"
xmlns:c="urn:clustering:1.0"
- version="3.0"
+ version="3.1"
impl-version="2.0">
<jee:assembly-descriptor>
10 years, 7 months
- 1
- 0
Seam SVN: r15620 - in branches/enterprise/WFK-2_1/examples: seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene and 5 other directories.
by seam-commits＠lists.jboss.org
Author: rsmeral
Date: 2013-10-21 08:17:24 -0400 (Mon, 21 Oct 2013)
New Revision: 15620
Modified:
branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/
branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/SellTest.java
branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/WebServicesTest.java
branches/enterprise/WFK-2_1/examples/seambay/seambay-web/
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb/
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/RoleTest.java
branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/UserTest.java
branches/enterprise/WFK-2_1/examples/tasks/tasks-ftest/src/test/java/org/jboss/seam/example/tasks/test/graphene/TasksFunctionalTest.java
branches/enterprise/WFK-2_1/examples/ui/ui-ftest/src/test/java/org/jboss/seam/example/ui/test/graphene/UIHTMLUnitTest.java
Log:
Fix forgotten ftests for new Graphene API
Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb
___________________________________________________________________
Added: svn:ignore
+ target
Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/SellTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/SellTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/SellTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -81,11 +81,11 @@
protected void submitSell2Page(int category, int subcategory) {
assertTrue("Navigation failure, sell2 page expected", browser.getCurrentUrl().contains(getProperty("SELL_2_URL")));
- waitModel().until(element(getBy("SELL_CATEGORY_SELECT_SECOND_OPTION")).isPresent());
+ waitModel().until().element(getBy("SELL_CATEGORY_SELECT_SECOND_OPTION")).is().present();
new Select(browser.findElement(getBy("SELL_CATEGORY_SELECT"))).selectByIndex(category);
if (subcategory != 0) {
- waitModel().until(element(getBy("SELL_SUBCATEGORY_SELECT")).isPresent());
+ waitModel().until().element(getBy("SELL_SUBCATEGORY_SELECT")).is().present();
new Select(browser.findElement(getBy("SELL_SUBCATEGORY_SELECT"))).selectByIndex(subcategory);
}
clickAndWaitHttp(getBy("SELL_NEXT"));
Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/WebServicesTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/WebServicesTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ftest/src/test/java/org/jboss/seam/example/seambay/test/graphene/WebServicesTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -4,8 +4,8 @@
import java.net.MalformedURLException;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
-import static org.jboss.arquillian.graphene.Graphene.*;
import org.jboss.arquillian.graphene.wait.WebDriverWait;
+import org.jboss.arquillian.graphene.wait.WebDriverWaitImpl;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.junit.InSequence;
import org.jboss.seam.example.common.test.DeploymentResolver;
@@ -106,7 +106,7 @@
// the same as Selenium, must use getValue to retrieve text inside
// <textarea></textarea>
- waitCustom().withMessage("Response area should contain \"true\"").until(element(RESPONSE_AREA).attribute("value").contains(LOGIN_RIGHT_RESPONSE));
+ waitCustom().withMessage("Response area should contain \"true\"").until().element(RESPONSE_AREA).attribute("value").contains(LOGIN_RIGHT_RESPONSE);
}
@Test
@@ -116,7 +116,7 @@
clickAndWaitForPage(LIST_CATEGORIES_LINK_TEXT);
clickAndWaitAjax(INVOKE_SERVICE_BUTTON);
waitForCidUpdate();
- waitCustom().withMessage("Response area should contain a list of categories.").until(element(RESPONSE_AREA).attribute("value").contains(LIST_CATEGORIES_RESPONSE));
+ waitCustom().withMessage("Response area should contain a list of categories.").until().element(RESPONSE_AREA).attribute("value").contains(LIST_CATEGORIES_RESPONSE);
}
@Test
@@ -127,8 +127,8 @@
waitCustom().withMessage("Response area should contain information about creating the auction.").until(new Predicate() {
public boolean apply(Object t) {
- return element(RESPONSE_AREA).attribute("value").contains(CREATE_NEW_AUCTION_RESPONSE_JBOSS_56).apply(browser)
- || element(RESPONSE_AREA).attribute("value").contains(CREATE_NEW_AUCTION_RESPONSE_JBOSS_4).apply(browser);
+ return browser.findElement(RESPONSE_AREA).getAttribute("value").contains(CREATE_NEW_AUCTION_RESPONSE_JBOSS_56)
+ || browser.findElement(RESPONSE_AREA).getAttribute("value").contains(CREATE_NEW_AUCTION_RESPONSE_JBOSS_4);
}
});
}
@@ -145,7 +145,7 @@
type(SEARCH_TERM, searchTerm);
clickAndWaitAjax(INVOKE_SERVICE_BUTTON);
waitForCidUpdate();
- waitCustom().withMessage("Response area should contain information about finding auction.").until(element(RESPONSE_AREA).attribute("value").contains(FIND_AUCTIONS_RESPONSE));
+ waitCustom().withMessage("Response area should contain information about finding auction.").until().element(RESPONSE_AREA).attribute("value").contains(FIND_AUCTIONS_RESPONSE);
}
@Test
@@ -165,8 +165,8 @@
waitForCidUpdate();
waitCustom().withMessage("Response area should contain information about updating the auction.").until(new Predicate() {
public boolean apply(Object t) {
- return element(RESPONSE_AREA).attribute("value").contains(UPDATE_AUCTION_RESPONSE_JBOSS_56).apply(browser)
- || element(RESPONSE_AREA).attribute("value").contains(UPDATE_AUCTION_RESPONSE_JBOSS_4).apply(browser);
+ return browser.findElement(RESPONSE_AREA).getAttribute("value").contains(UPDATE_AUCTION_RESPONSE_JBOSS_56)
+ || browser.findElement(RESPONSE_AREA).getAttribute("value").contains(UPDATE_AUCTION_RESPONSE_JBOSS_4);
}
});
}
@@ -184,8 +184,8 @@
waitForCidUpdate();
waitCustom().withMessage("Response area should contain information about setting duration.").until(new Predicate() {
public boolean apply(Object t) {
- return element(RESPONSE_AREA).attribute("value").contains(SET_DURATION_RESPONSE_JBOSS_56).apply(browser)
- || element(RESPONSE_AREA).attribute("value").contains(SET_DURATION_RESPONSE_JBOSS_4).apply(browser);
+ return browser.findElement(RESPONSE_AREA).getAttribute("value").contains(SET_DURATION_RESPONSE_JBOSS_56)
+ || browser.findElement(RESPONSE_AREA).getAttribute("value").contains(SET_DURATION_RESPONSE_JBOSS_4);
}
});
@@ -204,8 +204,8 @@
waitForCidUpdate();
waitCustom().withMessage("Response area should contain information about setting starting price.").until(new Predicate() {
public boolean apply(Object t) {
- return element(RESPONSE_AREA).attribute("value").contains(SET_STARTING_PRICE_RESPONSE_JBOSS_56).apply(browser)
- || element(RESPONSE_AREA).attribute("value").contains(SET_STARTING_PRICE_RESPONSE_JBOSS_4).apply(browser);
+ return browser.findElement(RESPONSE_AREA).getAttribute("value").contains(SET_STARTING_PRICE_RESPONSE_JBOSS_56)
+ || browser.findElement(RESPONSE_AREA).getAttribute("value").contains(SET_STARTING_PRICE_RESPONSE_JBOSS_4);
}
});
}
@@ -220,7 +220,7 @@
clickAndWaitAjax(INVOKE_SERVICE_BUTTON);
waitUntilValueNotEmpty(RESPONSE_AREA);
waitForCidUpdate();
- waitCustom().withMessage("Response area should contain auction details.").until(element(RESPONSE_AREA).attribute("value").contains(AUCTION_DETAILS_PRICE_RESPONSE));
+ waitCustom().withMessage("Response area should contain auction details.").until().element(RESPONSE_AREA).attribute("value").contains(AUCTION_DETAILS_PRICE_RESPONSE);
}
@Test
@@ -230,7 +230,7 @@
clickAndWaitForPage(LOGOUT_LINK_TEXT);
clickAndWaitAjax(INVOKE_SERVICE_BUTTON);
- waitCustom().withMessage("Response area should contain logout confirmation.").until(element(RESPONSE_AREA).attribute("value").contains(LOGOUT_RESPONSE));
+ waitCustom().withMessage("Response area should contain logout confirmation.").until().element(RESPONSE_AREA).attribute("value").contains(LOGOUT_RESPONSE);
}
@Test
@@ -241,8 +241,8 @@
confirmAuctionService();
waitCustom().withMessage("Response area should contain information about confirmation.").until(new Predicate() {
public boolean apply(Object t) {
- return element(RESPONSE_AREA).attribute("value").contains(CONFIRMATION_RESPONSE_JBOSS_56).apply(browser)
- || element(RESPONSE_AREA).attribute("value").contains(CONFIRMATION_RESPONSE_JBOSS_4).apply(browser);
+ return browser.findElement(RESPONSE_AREA).getAttribute("value").contains(CONFIRMATION_RESPONSE_JBOSS_56)
+ || browser.findElement(RESPONSE_AREA).getAttribute("value").contains(CONFIRMATION_RESPONSE_JBOSS_4);
}
});
}
@@ -255,7 +255,7 @@
String password = "demo";
open(contextPath.toString() + getProperty("HOME_PAGE"));
- waitCustom().until(element(HERE_LINK).isPresent());
+ waitCustom().until().element(HERE_LINK).is().present();
clickAndWaitHttp(HERE_LINK);
clickAndWaitForPage(LOGIN_LINK_TEXT);
@@ -265,7 +265,7 @@
clickAndWaitAjax(INVOKE_SERVICE_BUTTON);
waitForCidUpdate();
- waitCustom().until(element(RESPONSE_AREA).attribute("value").contains(LOGIN_RIGHT_RESPONSE));
+ waitCustom().until().element(RESPONSE_AREA).attribute("value").contains(LOGIN_RIGHT_RESPONSE);
}
protected void confirmAuctionService() {
@@ -287,9 +287,9 @@
}
protected void clickAndWaitForPage(String linkText) {
- waitCustom().until(element(By.partialLinkText(linkText)).isPresent());
+ waitCustom().until().element(By.partialLinkText(linkText)).is().present();
click(By.partialLinkText(linkText));
- waitCustom().until(element(SELECTED_SERVICE).text().contains(linkText));
+ waitCustom().until().element(SELECTED_SERVICE).text().contains(linkText);
}
protected void waitForCidUpdate() {
@@ -302,7 +302,7 @@
}
public WebDriverWait waitCustom() {
- return new WebDriverWait<Void>(null, browser, WAIT_TIMEOUT);
+ return new WebDriverWaitImpl<Void>(null, browser, WAIT_TIMEOUT);
}
protected void waitUntilValueNotEmpty(final By by) {
Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-web
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ejb
___________________________________________________________________
Added: svn:ignore
+ target
Modified: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/RoleTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/RoleTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/RoleTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -108,7 +108,7 @@
assertTrue("Expected role deletion confirmation.", confirm.getText().contains(getProperty("ROLE_TABLE_DELETE_CONFIRMATION")));
confirm.accept();
sleep(2000);
- waitModel().until(element(getBy(roleRow)).not().isPresent());
+ waitModel().until().element(getBy(roleRow)).is().not().present();
assertFalse("Removed role still present.", isElementPresent(getBy(roleRow)));
}
Modified: branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/UserTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/UserTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/seamspace/seamspace-ftest/src/test/java/org/jboss/seam/example/seamspace/test/graphene/UserTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -97,7 +97,7 @@
click(getBy(userRow + getProperty("USER_TABLE_DELETE")));
browser.switchTo().alert().accept();
browser.switchTo().window(windowHandle);
- waitModel().until(element(getBy(userRow)).not().isPresent());
+ waitModel().until().element(getBy(userRow)).is().not().present();
assertFalse("User " + username + " exists after deletion", isElementPresent(getBy(userRow)));
}
Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ftest/src/test/java/org/jboss/seam/example/tasks/test/graphene/TasksFunctionalTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/tasks/tasks-ftest/src/test/java/org/jboss/seam/example/tasks/test/graphene/TasksFunctionalTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ftest/src/test/java/org/jboss/seam/example/tasks/test/graphene/TasksFunctionalTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -89,7 +89,7 @@
type(getBy(LOGIN_PASSWORD), DEFAULT_PASSWORD);
click(getBy(LOGIN_SUBMIT));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(CATEGORIES_PRESENT)).isPresent());
+ waitModel().until().element(getBy(CATEGORIES_PRESENT)).is().present();
assertTrue("Navigation failure. Tasks page expected.", browser.getCurrentUrl().contains(TASKS_URL));
}
@@ -101,7 +101,7 @@
buttonMissing(turing, RESOLVE_BTN_TITLE);
click(getBy(RESOLVED_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(TASKS_PRESENT)).isPresent());
+ waitModel().until().element(getBy(TASKS_PRESENT)).is().present();
buttonPresent(turing, UNDO_BTN_TITLE);
clickAndWaitHttp(getBy(LOGOUT_LINK));
@@ -114,7 +114,7 @@
buttonMissing(milk, RESOLVE_BTN_TITLE);
click(getBy(RESOLVED_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(TASKS_PRESENT)).isPresent());
+ waitModel().until().element(getBy(TASKS_PRESENT)).is().present();
buttonMissing(milk, UNDO_BTN_TITLE);
clickAndWaitHttp(getBy(LOGOUT_LINK));
@@ -125,14 +125,14 @@
String turtle = "Buy a turtle";
click(getBy(RESOLVED_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(TASKS_PRESENT)).isPresent());
+ waitModel().until().element(getBy(TASKS_PRESENT)).is().present();
undoTask(turtle);
buttonMissing(turtle, UNDO_BTN_TITLE);
click(getBy(TASKS_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(CATEGORIES_PRESENT)).isPresent());
+ waitModel().until().element(getBy(CATEGORIES_PRESENT)).is().present();
buttonPresent(turtle, RESOLVE_BTN_TITLE);
clickAndWaitHttp(getBy(LOGOUT_LINK));
@@ -153,7 +153,7 @@
String category = "JBoss QA";
click(getBy(CATEGORIES_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(CATEGORIES_PRESENT)).isPresent());
+ waitModel().until().element(getBy(CATEGORIES_PRESENT)).is().present();
newCategory(category);
buttonPresent(category, DELETE_BTN_CAT_TITLE);
@@ -173,11 +173,11 @@
String category = "School";
click(getBy(CATEGORIES_LINK));
sleep(2000);// ugly, but need to wait until the table is fully (ajax) loaded
- waitModel().until(element(getBy(CATEGORIES_PRESENT)).isPresent());
+ waitModel().until().element(getBy(CATEGORIES_PRESENT)).is().present();
buttonPress(category, DELETE_BTN_CAT_TITLE);
By by = getBy(String.format(ACTION_BUTTON_FORMATTER, category, DELETE_BTN_CAT_TITLE));
- waitModel().until(element(by).not().isPresent());
+ waitModel().until().element(by).is().not().present();
buttonMissing(category, DELETE_BTN_CAT_TITLE);
// all tasks from category are deleted as well
@@ -194,7 +194,7 @@
*/
protected void undoTask(String task) {
By by = buttonPress(task, UNDO_BTN_TITLE);
- waitModel().until(element(by).not().isPresent());
+ waitModel().until().element(by).is().not().present();
}
/**
@@ -204,7 +204,7 @@
*/
protected void resolveTask(String task) {
By by = buttonPress(task, RESOLVE_BTN_TITLE);
- waitModel().until(element(by).not().isPresent());
+ waitModel().until().element(by).is().not().present();
}
/**
@@ -214,7 +214,7 @@
*/
protected void deleteTask(String task) {
By by = buttonPress(task, DELETE_BTN_TITLE);
- waitModel().until(element(by).not().isPresent());
+ waitModel().until().element(by).is().not().present();
}
/**
@@ -240,7 +240,7 @@
protected By buttonPresent(String description, String button) {
String btnStr = String.format(ACTION_BUTTON_FORMATTER, description, button);
By btn = getBy(btnStr);
- waitModel().until(element(btn).isPresent());
+ waitModel().until().element(btn).is().present();
assertTrue("There should be a '" + button + "' button for: " + description + ".", isElementPresent(btn));
return btn;
}
@@ -270,7 +270,7 @@
type(getBy(NEW_TASK_DESCRIPTION), description);
clickAndWaitAjax(getBy(NEW_TASK_SUBMIT));
By by = getBy(String.format(ACTION_BUTTON_FORMATTER, description, RESOLVE_BTN_TITLE));
- waitModel().until(element(by).isPresent());
+ waitModel().until().element(by).is().present();
}
@@ -289,7 +289,7 @@
clickAndWaitAjax(getBy(EDIT_TASK_SUBMIT));
By by = getBy(String.format(ACTION_BUTTON_FORMATTER, newDescription, RESOLVE_BTN_TITLE));
- waitModel().until(element(by).isPresent());
+ waitModel().until().element(by).is().present();
}
@@ -303,6 +303,6 @@
type(getBy(NEW_CATEGORY_DESCRIPTION), category);
clickAndWaitAjax(getBy(NEW_CATEGORY_SUBMIT));
By by = getBy(String.format(ACTION_BUTTON_FORMATTER, category, DELETE_BTN_CAT_TITLE));
- waitModel().until(element(by).isPresent());
+ waitModel().until().element(by).is().present();
}
}
Modified: branches/enterprise/WFK-2_1/examples/ui/ui-ftest/src/test/java/org/jboss/seam/example/ui/test/graphene/UIHTMLUnitTest.java
===================================================================
--- branches/enterprise/WFK-2_1/examples/ui/ui-ftest/src/test/java/org/jboss/seam/example/ui/test/graphene/UIHTMLUnitTest.java 2013-10-15 11:53:02 UTC (rev 15619)
+++ branches/enterprise/WFK-2_1/examples/ui/ui-ftest/src/test/java/org/jboss/seam/example/ui/test/graphene/UIHTMLUnitTest.java 2013-10-21 12:17:24 UTC (rev 15620)
@@ -67,13 +67,13 @@
((JavascriptExecutor) browser).executeScript("document.getElementById(arguments[0]).value = arguments[1]", browser.findElement(FILE_UPLOAD_FILE).getAttribute("id"), IMAGE_TO_UPLOAD);
Graphene.guardHttp(browser.findElement(FILE_UPLOAD_UPDATE)).click();
- assertTrue("Page should contain \"Successfully updated\"", Graphene.element(FILE_UPLOAD_RESPONSE).isPresent().apply(browser));
+ assertTrue("Page should contain \"Successfully updated\"", browser.findElement(FILE_UPLOAD_RESPONSE).isDisplayed());
}
@Test
@InSequence(2)
public void graphicImageTest() throws IOException {
Graphene.guardHttp(browser.findElement(GRAPHIC_IMAGE_LINK)).click();
- assertTrue("Page should contain image of Pete Muir", Graphene.element(IMAGE).isPresent().apply(browser));
+ assertTrue("Page should contain image of Pete Muir", browser.findElement(IMAGE).isDisplayed());
}
}
10 years, 7 months
- 1
- 0
Seam SVN: r15619 - branches/enterprise/WFK-2_1/bom.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-15 07:53:02 -0400 (Tue, 15 Oct 2013)
New Revision: 15619
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
updates of HSearch to 4.4.0.Final-redhat-wfk-1 and Graphene2 to 2.0.0.Final
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-10-15 11:52:55 UTC (rev 15618)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-10-15 11:53:02 UTC (rev 15619)
@@ -45,7 +45,7 @@
<version.org.hibernate>4.2.0.SP1-redhat-1</version.org.hibernate>
<version.org.hibernate.common>4.0.1.Final-redhat-2</version.org.hibernate.common>
<version.org.hibernate.javax.persistence>1.0.1.Final-redhat-2</version.org.hibernate.javax.persistence>
- <version.org.hibernate.search>4.3.0.Final-redhat-wfk-3</version.org.hibernate.search>
+ <version.org.hibernate.search>4.4.0.Final-redhat-wfk-1</version.org.hibernate.search>
<version.org.hibernate.validator>4.3.1.Final-redhat-1</version.org.hibernate.validator>
<version.infinispan>5.2.7.Final-redhat-1</version.infinispan>
@@ -59,7 +59,7 @@
<!-- Versions of Arquillian and Shrinkwrap -->
<version.org.jboss.arquillian>1.1.0.Final</version.org.jboss.arquillian>
<version.org.jboss.arquillian.extension.drone>1.2.0.Final</version.org.jboss.arquillian.extension.drone>
- <version.org.jboss.arquillian.graphene>2.0.0.Beta1</version.org.jboss.arquillian.graphene>
+ <version.org.jboss.arquillian.graphene>2.0.0.Final</version.org.jboss.arquillian.graphene>
<version.org.jboss.as.arquillian.container>7.2.0.Final</version.org.jboss.as.arquillian.container>
<version.org.jboss.shrinkwrap.resolver>2.0.0</version.org.jboss.shrinkwrap.resolver>
10 years, 7 months
- 1
- 0
Seam SVN: r15618 - in branches/enterprise/WFK-2_1/examples/booking: booking-ear and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-15 07:52:55 -0400 (Tue, 15 Oct 2013)
New Revision: 15618
Modified:
branches/enterprise/WFK-2_1/examples/booking/README.html
branches/enterprise/WFK-2_1/examples/booking/README.md
branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml
Log:
https://issues.jboss.org/browse/WFK2-106 added openshift profile into booking example
Modified: branches/enterprise/WFK-2_1/examples/booking/README.html
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/README.html 2013-10-14 08:53:38 UTC (rev 15617)
+++ branches/enterprise/WFK-2_1/examples/booking/README.html 2013-10-15 11:52:55 UTC (rev 15618)
@@ -1,124 +1,944 @@
-<h1>Seam Booking Example</h1>
-
-<p>This example demonstrates the use of Seam in a Java EE 6 environment.
-Transaction and persistence context management is handled by the EJB container. This example runs on JBoss AS as an EAR.</p>
-
-<h2>Running the example</h2>
-
-<h3>Using Maven</h3>
-
-<p>To deploy the example to a running JBoss AS instance, follow these steps:</p>
-
-<ol>
-<li><p>In the example root directory run:</p>
-
-<pre><code>mvn clean install
-</code></pre></li>
-<li><p>Set JBOSS_HOME environment property.</p></li>
-<li><p>In the booking-ear directory run:</p>
-
-<pre><code>mvn jboss-as:deploy
-</code></pre></li>
-<li><p>Open this URL in a web browser: http://localhost:8080/seam-booking</p></li>
-</ol>
-
-<h3>Using Ant</h3>
-
-<ol>
-<li><p>In the example root directory run:</p>
-
-<p>ant clean package</p></li>
-<li><p>Copy <code>seam-booking.ear</code> from directory <code>booking-ear/target</code> to the deployment directory of JBoss AS <code>($JBOSS_HOME/standalone/deployments</code> by default)</p></li>
-<li><p>Open this URL in a web browser: <code>http://localhost:8080/seam-booking</code></p></li>
-</ol>
-
-<h2>Testing the example</h2>
-
-<p>This example is covered by integration and functional tests. All tests use the following technologies:</p>
-
-<ul>
-<li><strong>Arquillian</strong> - as the framework for EE testing, for managing of container lifecycle and deployment of test archive,</li>
-<li><strong>ShrinkWrap</strong> - to create the test archive (WAR).</li>
-</ul>
-
-<h3>Integration tests</h3>
-
-<p>Integration tests cover core application logic and reside in the EJB module. In addition to Arquillian and ShrinkWrap, the integration tests also use:</p>
-
-<ul>
-<li><strong>JUnitSeamTest</strong> - to hook into the JSF lifecycle and assert server-side state,</li>
-<li><strong>ShrinkWrap Resolver</strong> - to resolve dependencies of the project for packaging in the test archive.</li>
-</ul>
-
-<p>The tests are executed in Maven's test phase. By default they are skipped and can be executed on JBoss AS with:</p>
-
-<pre><code>mvn clean test -Darquillian=jbossas-managed-7
-</code></pre>
-
-<p>The <code>JBOSS_HOME</code> environment variable must be set and point to a JBoss AS instance directory.</p>
-
-<p>To test on a running server, use</p>
-
-<pre><code>mvn clean test -Darquillian=jbossas-remote-7
-</code></pre>
-
-<h4>Using Ant</h4>
-
-<p>In the example root directory run:</p>
-
-<pre><code>ant clean test
-</code></pre>
-
-<h3>Functional tests</h3>
-
-<p>Functional tests are located in a separate project and are not executed during the build of the example. They test the built archive in an application server through browser-testing. They use:</p>
-
-<ul>
-<li><strong>Arquillian Graphene Extension</strong> - an advanced Ajax-capable type-safe Selenium-based browser testing tool,</li>
-<li><strong>Arquillian Drone Extension</strong> - to automatically run and stop browser instances.</li>
-</ul>
-
-<p><em>Note: It is necessary to first build and package the example, because the functional test references the built archive for automatic deployment to the server.</em></p>
-
-<p>Run the functional test on JBoss AS instance with</p>
-
-<pre><code>mvn -f booking-ftest/pom.xml clean test
-</code></pre>
-
-<p>The <code>JBOSS_HOME</code> environment variable must be set and point to a JBoss AS instance directory.</p>
-
-<p>Several variables can be configured:</p>
-
-<ul>
-<li><p>path to an alternative archive for testing</p>
-
-<pre><code>-DtestDeployment=/path/to/archive.ear
-</code></pre></li>
-<li><p>the browser to use for testing</p>
-
-<pre><code>-Dbrowser=htmlUnit
-</code></pre></li>
-<li><p>test on a running server</p>
-
-<pre><code>-Dremote
-</code></pre></li>
-</ul>
-
-<h2>Testing in JBDS</h2>
-
-<h3>Integration tests</h3>
-
-<ol>
-<li><p>Open JBDS and start a configured instance of JBoss AS</p></li>
-<li><p>Import the example project and its submodules</p></li>
-<li><p>In the <em>Project Explorer</em>, select the EJB module project, then</p>
-
-<ol>
-<li>Type <code>Ctrl+Alt+P</code> (<em>Select Maven Profiles</em>) and check <code>integration-tests</code> and <code>arq-jbossas-7-remote</code></li>
-<li>Right-click the module and select <em>Run As</em> - <em>JUnit Test</em></li>
-</ol></li>
-</ol>
-
-<h3>Functional tests</h3>
-
-<p>It is not possible to run the functional tests of this example in JBDS, because they use the maven-dependency-plugin to copy test classes from a different maven artifact, which is not a configuration supported by JBDS.</p>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.7" />
+<title></title>
+<style type="text/css">
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
+}
+
+body {
+ margin: 1em 5% 1em 5%;
+}
+
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
+
+em {
+ font-style: italic;
+ color: navy;
+}
+
+strong {
+ font-weight: bold;
+ color: #083194;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ color: #527bbd;
+ margin-top: 1.2em;
+ margin-bottom: 0.5em;
+ line-height: 1.3;
+}
+
+h1, h2, h3 {
+ border-bottom: 2px solid silver;
+}
+h2 {
+ padding-top: 0.5em;
+}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
+h5 {
+ font-size: 1.0em;
+}
+
+div.sectionbody {
+ margin-left: 0;
+}
+
+hr {
+ border: 1px solid silver;
+}
+
+p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+}
+
+ul, ol, li > p {
+ margin-top: 0;
+}
+ul > li { color: #aaa; }
+ul > li > * { color: black; }
+
+pre {
+ padding: 0;
+ margin: 0;
+}
+
+#author {
+ color: #527bbd;
+ font-weight: bold;
+ font-size: 1.1em;
+}
+#email {
+}
+#revnumber, #revdate, #revremark {
+}
+
+#footer {
+ font-size: small;
+ border-top: 2px solid silver;
+ padding-top: 0.5em;
+ margin-top: 4.0em;
+}
+#footer-text {
+ float: left;
+ padding-bottom: 0.5em;
+}
+#footer-badges {
+ float: right;
+ padding-bottom: 0.5em;
+}
+
+#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
+div.imageblock, div.exampleblock, div.verseblock,
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
+div.admonitionblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
+}
+div.admonitionblock {
+ margin-top: 2.0em;
+ margin-bottom: 2.0em;
+ margin-right: 10%;
+ color: #606060;
+}
+
+div.content { /* Block element content. */
+ padding: 0;
+}
+
+/* Block element titles. */
+div.title, caption.title {
+ color: #527bbd;
+ font-weight: bold;
+ text-align: left;
+ margin-top: 1.0em;
+ margin-bottom: 0.5em;
+}
+div.title + * {
+ margin-top: 0;
+}
+
+td div.title:first-child {
+ margin-top: 0.0em;
+}
+div.content div.title:first-child {
+ margin-top: 0.0em;
+}
+div.content + div.title {
+ margin-top: 0.0em;
+}
+
+div.sidebarblock > div.content {
+ background: #ffffee;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
+ padding: 0.5em;
+}
+
+div.listingblock > div.content {
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
+ padding: 0.5em;
+}
+
+div.quoteblock, div.verseblock {
+ padding-left: 1.0em;
+ margin-left: 1.0em;
+ margin-right: 10%;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
+}
+
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
+div.verseblock + div.attribution {
+ text-align: left;
+}
+
+div.admonitionblock .icon {
+ vertical-align: top;
+ font-size: 1.1em;
+ font-weight: bold;
+ text-decoration: underline;
+ color: #527bbd;
+ padding-right: 0.5em;
+}
+div.admonitionblock td.content {
+ padding-left: 0.5em;
+ border-left: 3px solid #dddddd;
+}
+
+div.exampleblock > div.content {
+ border-left: 3px solid #dddddd;
+ padding-left: 0.5em;
+}
+
+div.imageblock div.content { padding-left: 0; }
+span.image img { border-style: none; }
+a.image:visited { color: white; }
+
+dl {
+ margin-top: 0.8em;
+ margin-bottom: 0.8em;
+}
+dt {
+ margin-top: 0.5em;
+ margin-bottom: 0;
+ font-style: normal;
+ color: navy;
+}
+dd > *:first-child {
+ margin-top: 0.1em;
+}
+
+ul, ol {
+ list-style-position: outside;
+}
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
+ list-style-type: lower-alpha;
+}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
+
+tfoot {
+ font-weight: bold;
+}
+td > div.verse {
+ white-space: pre;
+}
+
+div.hdlist {
+ margin-top: 0.8em;
+ margin-bottom: 0.8em;
+}
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
+ vertical-align: top;
+ font-style: normal;
+ padding-right: 0.8em;
+ color: navy;
+}
+td.hdlist2 {
+ vertical-align: top;
+}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
+
+.footnote, .footnoteref {
+ font-size: 0.8em;
+}
+
+span.footnote, span.footnoteref {
+ vertical-align: super;
+}
+
+#footnotes {
+ margin: 20px 0 20px 0;
+ padding: 7px 0 0 0;
+}
+
+#footnotes div.footnote {
+ margin: 0 0 5px 0;
+}
+
+#footnotes hr {
+ border: none;
+ border-top: 1px solid silver;
+ height: 1px;
+ text-align: left;
+ margin-left: 0;
+ width: 20%;
+ min-width: 100px;
+}
+
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
+
+@media print {
+ #footer-badges { display: none; }
+}
+
+#toc {
+ margin-bottom: 2.5em;
+}
+
+#toctitle {
+ color: #527bbd;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+div.unbreakable { page-break-inside: avoid; }
+
+
+/*
+ * xhtml11 specific
+ *
+ * */
+
+tt {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
+}
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
+}
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
+
+/*
+ * html5 specific
+ *
+ * */
+
+.monospaced {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
+}
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
+}
+thead, p.tableblock.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
+}
+
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
+}
+
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
+ text-align: right;
+}
+
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
+}
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
+}
+
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
+}
+body.manpage div.sectionbody {
+ margin-left: 3em;
+}
+
+@media print {
+ body.manpage div#toc { display: none; }
+}
+</style>
+<script type="text/javascript">
+/*<+'])');
+ // Function that scans the DOM tree for header elements (the DOM2
+ // nodeIterator API would be a better technique but not supported by all
+ // browsers).
+ var iterate = function (el) {
+ for (var i = el.firstChild; i != null; i = i.nextSibling) {
+ if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
+ var mo = re.exec(i.tagName);
+ if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
+ result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
+ }
+ iterate(i);
+ }
+ }
+ }
+ iterate(el);
+ return result;
+ }
+
+ var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
+ var entries = tocEntries(document.getElementById("content"), toclevels);
+ for (var i = 0; i < entries.length; ++i) {
+ var entry = entries[i];
+ if (entry.element.id == "")
+ entry.element.id = "_toc_" + i;
+ var a = document.createElement("a");
+ a.href = "#" + entry.element.id;
+ a.appendChild(document.createTextNode(entry.text));
+ var div = document.createElement("div");
+ div.appendChild(a);
+ div.className = "toclevel" + entry.toclevel;
+ toc.appendChild(div);
+ }
+ if (entries.length == 0)
+ toc.parentNode.removeChild(toc);
+},
+
+
+/////////////////////////////////////////////////////////////////////
+// Footnotes generator
+/////////////////////////////////////////////////////////////////////
+
+/* Based on footnote generation code from:
+ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
+ */
+
+footnotes: function () {
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
+ var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
+ var spans = cont.getElementsByTagName("span");
+ var refs = {};
+ var n = 0;
+ for (i=0; i<spans.length; i++) {
+ if (spans[i].className == "footnote") {
+ n++;
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
+ noteholder.innerHTML +=
+ "<div class='footnote' id='_footnote_" + n + "'>" +
+ "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
+ n + "</a>. " + note + "</div>";
+ var id =spans[i].getAttribute("id");
+ if (id != null) refs["#"+id] = n;
+ }
+ }
+ if (n == 0)
+ noteholder.parentNode.removeChild(noteholder);
+ else {
+ // Process footnoterefs.
+ for (i=0; i<spans.length; i++) {
+ if (spans[i].className == "footnoteref") {
+ var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
+ href = href.match(/#.*/)[0]; // Because IE return full URL.
+ n = refs[href];
+ spans[i].innerHTML =
+ "[<a href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ }
+ }
+ }
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
+}
+
+}
+asciidoc.install();
+/*]]>*/
+</script>
+</head>
+<body class="article">
+<div id="header">
+</div>
+<div id="content">
+<div class="paragraph"><p>Seam Booking Example</p></div>
+<div class="exampleblock">
+<div class="content">
+<div class="paragraph"><p>This example demonstrates the use of Seam in a Java EE 6 environment.
+Transaction and persistence context management is handled by the EJB container. This example runs on JBoss AS as an EAR.</p></div>
+<div class="paragraph"><p># Using Maven</p></div>
+<div class="paragraph"><p>To deploy the example to a running JBoss AS instance, follow these steps:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+In the example root directory run:
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn clean install</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+Set JBOSS_HOME environment property.
+</p>
+</li>
+<li>
+<p>
+In the booking-ear directory run:
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn jboss-as:deploy</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+Open this URL in a web browser: <a href="http://localhost:8080/seam-booking">http://localhost:8080/seam-booking</a>
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p># Using Ant</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+In the example root directory run:
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>ant clean package</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+Copy <tt>seam-booking.ear</tt> from directory <tt>booking-ear/target</tt> to the deployment directory of JBoss AS <tt>($JBOSS_HOME/standalone/deployments</tt> by default)
+</p>
+</li>
+<li>
+<p>
+Open this URL in a web browser: <tt>http://localhost:8080/seam-booking</tt>
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p># Openshift Deployment support</p></div>
+<div class="paragraph"><p>To deploy Booking example on openshift you can use prepared openshift profile like</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn clean install -Popenshift</tt></pre>
+</div></div>
+<div class="paragraph"><p>for creating deployments/seam-booking.ear and changing the web context root of application to be "/" to not append
+seam-booking string into web context root.
+You only need to use it like this is in your Openshift git repository.</p></div>
+<div class="paragraph"><p>This example is covered by integration and functional tests. All tests use the following technologies:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Arquillian</em> - as the framework for EE testing, for managing of container lifecycle and deployment of test archive,
+</p>
+</li>
+<li>
+<p>
+<em>ShrinkWrap</em> - to create the test archive (WAR).
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p># Integration tests</p></div>
+<div class="paragraph"><p>Integration tests cover core application logic and reside in the EJB module. In addition to Arquillian and ShrinkWrap, the integration tests also use:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>JUnitSeamTest</em> - to hook into the JSF lifecycle and assert server-side state,
+</p>
+</li>
+<li>
+<p>
+<em>ShrinkWrap Resolver</em> - to resolve dependencies of the project for packaging in the test archive.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The tests are executed in Maven’s test phase. By default they are skipped and can be executed on JBoss AS with:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn clean test -Darquillian=jbossas-managed-7</tt></pre>
+</div></div>
+<div class="paragraph"><p>The <tt>JBOSS_HOME</tt> environment variable must be set and point to a JBoss AS instance directory.</p></div>
+<div class="paragraph"><p>To test on a running server, use</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn clean test -Darquillian=jbossas-remote-7</tt></pre>
+</div></div>
+<div class="paragraph"><p>## Using Ant</p></div>
+<div class="paragraph"><p>In the example root directory run:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>ant clean test</tt></pre>
+</div></div>
+<div class="paragraph"><p># Functional tests</p></div>
+<div class="paragraph"><p>Functional tests are located in a separate project and are not executed during the build of the example. They test the built archive in an application server through browser-testing. They use:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Arquillian Graphene Extension</em> - an advanced Ajax-capable type-safe Selenium-based browser testing tool,
+</p>
+</li>
+<li>
+<p>
+<em>Arquillian Drone Extension</em> - to automatically run and stop browser instances.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Note: It is necessary to first build and package the example, because the functional test references the built archive for automatic deployment to the server.</em></p></div>
+<div class="paragraph"><p>Run the functional test on JBoss AS instance with</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>mvn -f booking-ftest/pom.xml clean test</tt></pre>
+</div></div>
+<div class="paragraph"><p>The <tt>JBOSS_HOME</tt> environment variable must be set and point to a JBoss AS instance directory.</p></div>
+<div class="paragraph"><p>Several variables can be configured:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+path to an alternative archive for testing
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>-DtestDeployment=/path/to/archive.ear</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+the browser to use for testing
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>-Dbrowser=htmlUnit</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+test on a running server
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>-Dremote</tt></pre>
+</div></div>
+</li>
+</ul></div>
+<div class="paragraph"><p># Integration tests</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Open JBDS and start a configured instance of JBoss AS
+</p>
+</li>
+<li>
+<p>
+Import the example project and its submodules
+</p>
+</li>
+<li>
+<p>
+In the <em>Project Explorer</em>, select the EJB module project, then
+</p>
+</li>
+<li>
+<p>
+Type <tt>Ctrl+Alt+P</tt> (<em>Select Maven Profiles</em>) and check <tt>integration-tests</tt> and <tt>arq-jbossas-7-remote</tt>
+</p>
+</li>
+<li>
+<p>
+Right-click the module and select <em>Run As</em> - <em>JUnit Test</em>
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p># Functional tests</p></div>
+<div class="paragraph"><p>It is not possible to run the functional tests of this example in JBDS, because they use the maven-dependency-plugin to copy test classes from a different maven artifact, which is not a configuration supported by JBDS.</p></div>
+</div></div>
+</div>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2013-10-14 14:17:45 CEST
+</div>
+</div>
+</body>
+</html>
Modified: branches/enterprise/WFK-2_1/examples/booking/README.md
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/README.md 2013-10-14 08:53:38 UTC (rev 15617)
+++ branches/enterprise/WFK-2_1/examples/booking/README.md 2013-10-15 11:52:55 UTC (rev 15618)
@@ -33,7 +33,16 @@
3. Open this URL in a web browser: `http://localhost:8080/seam-booking`
+### Openshift Deployment support
+To deploy Booking example on openshift you can use prepared openshift profile like
+
+ mvn clean install -Popenshift
+
+for creating deployments/seam-booking.ear and changing the web context root of application to be "/" to not append
+seam-booking string into web context root.
+You only need to use it like this is in your Openshift git repository.
+
Testing the example
-------------------
@@ -110,4 +119,4 @@
### Functional tests
-It is not possible to run the functional tests of this example in JBDS, because they use the maven-dependency-plugin to copy test classes from a different maven artifact, which is not a configuration supported by JBDS.
\ No newline at end of file
+It is not possible to run the functional tests of this example in JBDS, because they use the maven-dependency-plugin to copy test classes from a different maven artifact, which is not a configuration supported by JBDS.
Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml 2013-10-14 08:53:38 UTC (rev 15617)
+++ branches/enterprise/WFK-2_1/examples/booking/booking-ear/pom.xml 2013-10-15 11:52:55 UTC (rev 15618)
@@ -142,5 +142,39 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>openshift</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <outputDirectory>deployments</outputDirectory>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <filtering>true</filtering>
+ <modules>
+ <webModule>
+ <groupId>org.jboss.seam.examples.booking</groupId>
+ <artifactId>booking-web</artifactId>
+ <contextRoot>/</contextRoot>
+ <bundleFileName>booking-web.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <bundleFileName>booking-ejb.jar</bundleFileName>
+ </ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
10 years, 7 months
- 1
- 0
Seam SVN: r15617 - branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-14 04:53:38 -0400 (Mon, 14 Oct 2013)
New Revision: 15617
Added:
branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components-test.xml
Removed:
branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components.xml
Log:
https://issues.jboss.org/browse/WFK2-84 fixed forgotten contact-list renaming of components.xml to components-test.xml
Copied: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components-test.xml (from rev 15616, branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components.xml)
===================================================================
--- branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components-test.xml (rev 0)
+++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components-test.xml 2013-10-14 08:53:38 UTC (rev 15617)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.org/schema/seam/components"
+ xmlns:core="http://jboss.org/schema/seam/core"
+ xmlns:fwk="http://jboss.org/schema/seam/framework"
+ xmlns:persistence="http://jboss.org/schema/seam/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd
+ http://jboss.org/schema/seam/framework http://jboss.org/schema/seam/framework-2.3.xsd
+ http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd
+ http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd">
+
+ <persistence:managed-persistence-context name="entityManager"
+ persistence-unit-jndi-name="java:/contactlistEntityManagerFactory"/>
+
+ <core:init jndi-pattern="${jndiPattern}"/>
+
+ <factory name="contact" value="#{contactHome.instance}"/>
+ <fwk:entity-home name="contactHome"
+ entity-class="org.jboss.seam.example.contactlist.Contact"/>
+
+
+ <factory name="comment" value="#{commentHome.instance}"/>
+ <fwk:entity-home name="commentHome"
+ entity-class="org.jboss.seam.example.contactlist.Comment"
+ new-instance="#{newComment}"/>
+
+ <component name="newComment"
+ class="org.jboss.seam.example.contactlist.Comment">
+ <property name="contact">#{contact}</property>
+ <property name="created">#{currentDatetime}</property>
+ </component>
+
+
+ <fwk:entity-query name="contacts"
+ max-results="5">
+ <fwk:ejbql>select c from Contact c</fwk:ejbql>
+ <fwk:order>lastName</fwk:order>
+ <fwk:restrictions>
+ <value>lower(c.firstName) like lower( concat( #{exampleContact.firstName}, '%' ) )</value>
+ <value>lower(c.lastName) like lower( concat( #{exampleContact.lastName}, '%' ) )</value>
+ </fwk:restrictions>
+ </fwk:entity-query>
+
+ <component name="exampleContact"
+ class="org.jboss.seam.example.contactlist.Contact"/>
+
+</components>
Deleted: branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components.xml 2013-10-14 08:24:49 UTC (rev 15616)
+++ branches/enterprise/WFK-2_1/examples/contactlist/contactlist-ejb/src/test/resources/components.xml 2013-10-14 08:53:38 UTC (rev 15617)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns="http://jboss.org/schema/seam/components"
- xmlns:core="http://jboss.org/schema/seam/core"
- xmlns:fwk="http://jboss.org/schema/seam/framework"
- xmlns:persistence="http://jboss.org/schema/seam/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation=
- "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd
- http://jboss.org/schema/seam/framework http://jboss.org/schema/seam/framework-2.3.xsd
- http://jboss.org/schema/seam/persistence http://jboss.org/schema/seam/persistence-2.3.xsd
- http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd">
-
- <persistence:managed-persistence-context name="entityManager"
- persistence-unit-jndi-name="java:/contactlistEntityManagerFactory"/>
-
- <core:init jndi-pattern="${jndiPattern}"/>
-
- <factory name="contact" value="#{contactHome.instance}"/>
- <fwk:entity-home name="contactHome"
- entity-class="org.jboss.seam.example.contactlist.Contact"/>
-
-
- <factory name="comment" value="#{commentHome.instance}"/>
- <fwk:entity-home name="commentHome"
- entity-class="org.jboss.seam.example.contactlist.Comment"
- new-instance="#{newComment}"/>
-
- <component name="newComment"
- class="org.jboss.seam.example.contactlist.Comment">
- <property name="contact">#{contact}</property>
- <property name="created">#{currentDatetime}</property>
- </component>
-
-
- <fwk:entity-query name="contacts"
- max-results="5">
- <fwk:ejbql>select c from Contact c</fwk:ejbql>
- <fwk:order>lastName</fwk:order>
- <fwk:restrictions>
- <value>lower(c.firstName) like lower( concat( #{exampleContact.firstName}, '%' ) )</value>
- <value>lower(c.lastName) like lower( concat( #{exampleContact.lastName}, '%' ) )</value>
- </fwk:restrictions>
- </fwk:entity-query>
-
- <component name="exampleContact"
- class="org.jboss.seam.example.contactlist.Contact"/>
-
-</components>
10 years, 7 months
- 1
- 0
Seam SVN: r15616 - branches/enterprise/WFK-2_1/bom.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-14 04:24:49 -0400 (Mon, 14 Oct 2013)
New Revision: 15616
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
Log:
https://issues.jboss.org/browse/WFK2-211 updated Drone version to 1.2.0.Final
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-10-14 07:25:18 UTC (rev 15615)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-10-14 08:24:49 UTC (rev 15616)
@@ -58,7 +58,7 @@
<!-- Versions of Arquillian and Shrinkwrap -->
<version.org.jboss.arquillian>1.1.0.Final</version.org.jboss.arquillian>
- <version.org.jboss.arquillian.extension.drone>1.2.0.Beta2</version.org.jboss.arquillian.extension.drone>
+ <version.org.jboss.arquillian.extension.drone>1.2.0.Final</version.org.jboss.arquillian.extension.drone>
<version.org.jboss.arquillian.graphene>2.0.0.Beta1</version.org.jboss.arquillian.graphene>
<version.org.jboss.as.arquillian.container>7.2.0.Final</version.org.jboss.as.arquillian.container>
<version.org.jboss.shrinkwrap.resolver>2.0.0</version.org.jboss.shrinkwrap.resolver>
10 years, 7 months
- 1
- 0
Seam SVN: r15615 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-14 03:25:18 -0400 (Mon, 14 Oct 2013)
New Revision: 15615
Modified:
branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
Log:
adding comment why it org.jboss.seam.test.integration.faces.RestoreViewComponentAccessTest.java can fail
Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2013-10-14 07:25:06 UTC (rev 15614)
+++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2013-10-14 07:25:18 UTC (rev 15615)
@@ -101,6 +101,7 @@
page = page.getElementById("form:append").click();
assertFalse(page.getBody().getTextContent().contains("Sequence: 1, 2, 1"));
+ // this requires to have at least export LC_MESSAGES=en_US.utf8 or other similar english like locale
assertTrue(page.getBody().getTextContent().contains("value must be greater than or equal to 2"));
}
10 years, 7 months
- 1
- 0
Seam SVN: r15614 - in branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam: mock and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-10-14 03:25:06 -0400 (Mon, 14 Oct 2013)
New Revision: 15614
Added:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockPartialViewContext.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java
Log:
JBSEAM-5127 added JSF2 navigation handling in case of partialRequest
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java 2013-10-11 15:13:06 UTC (rev 15613)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java 2013-10-14 07:25:06 UTC (rev 15614)
@@ -7,6 +7,7 @@
import javax.faces.application.NavigationCase;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
+import javax.faces.context.PartialViewContext;
import org.jboss.seam.core.Init;
import org.jboss.seam.faces.FacesManager;
@@ -36,6 +37,8 @@
{
if ( !context.getResponseComplete() ) //workaround for a bug in MyFaces
{
+ String oldView = (context.getViewRoot() != null ? context.getViewRoot().getViewId() : "");
+
if ( isOutcomeViewId(outcome) )
{
FacesManager.instance().interpolateAndRedirect(outcome);
@@ -48,6 +51,14 @@
{
baseNavigationHandler.handleNavigation(context, fromAction, outcome);
}
+ else {
+ if (!oldView.equals(context.getViewRoot().getViewId())) {
+ PartialViewContext pctx = context.getPartialViewContext();
+ if (!pctx.isRenderAll()) {
+ pctx.setRenderAll(true);
+ }
+ }
+ }
}
}
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java 2013-10-11 15:13:06 UTC (rev 15613)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java 2013-10-14 07:25:06 UTC (rev 15614)
@@ -246,4 +246,8 @@
return false;
}
+ @Override
+ public MockPartialViewContext getPartialViewContext() {
+ return new MockPartialViewContext();
+ }
}
Added: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockPartialViewContext.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockPartialViewContext.java (rev 0)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockPartialViewContext.java 2013-10-14 07:25:06 UTC (rev 15614)
@@ -0,0 +1,92 @@
+package org.jboss.seam.mock;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.faces.context.PartialResponseWriter;
+import javax.faces.context.PartialViewContext;
+import javax.faces.event.PhaseId;
+
+public class MockPartialViewContext extends PartialViewContext
+{
+
+ Boolean partialRequest;
+ Boolean renderAll;
+ Boolean ajaxRequest;
+
+ public MockPartialViewContext()
+ {
+ partialRequest = true;
+ ajaxRequest = true;
+ renderAll = false;
+ }
+
+ @Override
+ public Collection<String> getExecuteIds()
+ {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public PartialResponseWriter getPartialResponseWriter()
+ {
+ return null;
+ }
+
+ @Override
+ public Collection<String> getRenderIds()
+ {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public boolean isAjaxRequest()
+ {
+ return this.ajaxRequest;
+ }
+
+ @Override
+ public boolean isExecuteAll()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isPartialRequest()
+ {
+ return this.partialRequest;
+ }
+
+ @Override
+ public boolean isRenderAll()
+ {
+ return this.renderAll;
+ }
+
+ @Override
+ public void processPartial(PhaseId arg0)
+ {
+
+ }
+
+ @Override
+ public void release()
+ {
+ this.renderAll = null;
+ this.partialRequest = null;
+ this.ajaxRequest = null;
+ }
+
+ @Override
+ public void setPartialRequest(boolean arg0)
+ {
+ this.partialRequest = arg0;
+ }
+
+ @Override
+ public void setRenderAll(boolean arg0)
+ {
+ this.renderAll = arg0;
+ }
+
+}
10 years, 7 months
- 1
- 0
[seam2/jboss-seam] 8d3c8b: add test for JBSEAM-5127
by GitHub
Branch: refs/heads/Seam_2_3
Home: https://github.com/seam2/jboss-seam
Commit: 8d3c8b4f2d5b638c8c44b6d487e7d8ab7289f855
https://github.com/seam2/jboss-seam/commit/8d3c8b4f2d5b638c8c44b6d487e7d8...
Author: maschmid <maschmid@a9c07ecc-ef43-0410-a306-c911db474e88>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/conversations/ConversationPropagationsTest.java
M seam-integration-tests/src/test/resources/org/jboss/seam/test/integration/faces/conversations/conversations.xhtml
Log Message:
-----------
add test for JBSEAM-5127
git-svn-id: https://svn.jboss.org/repos/seam/branches/enterprise/WFK-2_1@15611 a9c07ecc-ef43-0410-a306-c911db474e88
Commit: 1e947a35f84bcc150723f7cfa2c22e1860391dc8
https://github.com/seam2/jboss-seam/commit/1e947a35f84bcc150723f7cfa2c22e...
Author: Marek Novotný <hotmana76(a)gmail.com>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M jboss-seam/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java
M jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java
A jboss-seam/src/main/java/org/jboss/seam/mock/MockPartialViewContext.java
Log Message:
-----------
JBSEAM-5127 added JSF2 navigation handling in case of partialRequest
Commit: 0bbfbc33e6ca07500033fc8cc2b6720aa5a58c45
https://github.com/seam2/jboss-seam/commit/0bbfbc33e6ca07500033fc8cc2b672...
Author: Marek Novotný <hotmana76(a)gmail.com>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
Log Message:
-----------
adding comment why it org.jboss.seam.test.integration.faces.RestoreViewComponentAccessTest.java can fail
Compare: https://github.com/seam2/jboss-seam/compare/14be4608bda2...0bbfbc33e6ca
10 years, 7 months
- 1
- 0