JBoss Rich Faces SVN: r11833 - trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-16 13:08:02 -0500 (Tue, 16 Dec 2008)
New Revision: 11833
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
Log:
https://jira.jboss.org/jira/browse/RF-5351
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-16 18:05:49 UTC (rev 11832)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-16 18:08:02 UTC (rev 11833)
@@ -235,6 +235,7 @@
enableManualInput = false;
NULLModel = false;
firstWeekDay = 0;
+ disabled = false;
}
public String resetAction() {
@@ -454,6 +455,7 @@
showWeekDaysBar = true;
showWeeksBar = true;
firstWeekDay = 0;
+ disabled = false;
}
private String todayControlMode = "select";
@@ -551,5 +553,23 @@
public void setFirstWeekDay(int firstWeekDay) {
this.firstWeekDay = firstWeekDay;
}
-
+
+ private boolean disabled;
+
+ /**
+ * Gets value of disabled field.
+ * @return value of disabled field
+ */
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ /**
+ * Set a new value for disabled field.
+ * @param disabled a new value for disabled field
+ */
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
}
17 years, 5 months
JBoss Rich Faces SVN: r11832 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-16 13:05:49 -0500 (Tue, 16 Dec 2008)
New Revision: 11832
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/showAttributesTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5351
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/showAttributesTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-16 17:31:52 UTC (rev 11831)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-16 18:05:49 UTC (rev 11832)
@@ -168,6 +168,8 @@
String firstWeekDayId;
+ String isDisabledId;
+
void initIds(String parentId) {
calendarId = parentId + FORM_ID + "calendar";
calendarHeaderId = calendarId + "Header";
@@ -209,7 +211,8 @@
applyButtonXpath = "//td[@id='" + calendarFooterId + "']/table/tbody/tr/td[6]";
cleanButtonXPath = "//td[@id='"+calendarFooterId+"']/table/tbody/tr/td[2]";
calendarMessageId = parentId + FORM_ID + "calendarMsg";
- firstWeekDayId =parentId + FORM_ID + "firstWeekDay";
+ firstWeekDayId = parentId + FORM_ID + "firstWeekDay";
+ isDisabledId = parentId + FORM_ID + "isDisabled";
}
String getStatus() {
@@ -403,7 +406,7 @@
Assert.fail("Calendar displays invalid date. It should contain ["+expected+"]. But was ["+headerDate+"]");
}
}
-
+
@Test
public void testAjaxSingle(Template template) {
AutoTester tester = getAutoTester(this);
@@ -423,8 +426,7 @@
tester.testProcessAttribute();
}
-
-
+
// Erroneous test case.
/* @Test
public void testNULLModel(Template template) {
@@ -440,8 +442,7 @@
}*/
-
-
+
@Test
public void testJSAPI(Template template) {
renderPage(template, RESET_METHOD);
@@ -1176,9 +1177,58 @@
showPopup();
AssertTextEquals(firstWeekDayCellId, weekDayShortName, "It looks as if 'firstWeekDay' attribute doesn't work");
- }
+ }
@Test
+ public void testDisabledAttribute(Template template) {
+ renderPage(SHOW_ATTRIBURES_TEST_URL, template, INIT_SHOW_ATTRIBUTES_TEST);
+ initIds(getParentId());
+
+ writeStatus("Check 'disabled' attribute");
+ check(isDisabledId, true);
+
+ writeStatus("Popup mode");
+ check(showPopupId, true);
+
+ writeStatus("Check date input is disabled");
+ //Assert.assertFalse(selenium.isEditable(inputDateId), "Date input is not disabled");
+ //Assert.assertTrue(Boolean.parseBoolean(selenium.getAttribute(inputDateId + "@disabled")), "Date input is not disabled");
+ if(selenium.getXpathCount("//*[@id='" + inputDateId + "' and @disabled='true']").intValue() == 0) {
+ Assert.fail("Date input is not disabled");
+ }
+ writeStatus("button does not trigger popup calendar");
+ showPopup();
+ Assert.assertFalse(isVisible(calendarId), "Calendar popup should not be shown up");
+ writeStatus("and decorated with disabled icon");
+ testIcon(popupButtonId, "Disabled");
+
+ writeStatus("Non-popup mode");
+ check(showPopupId, false);
+ writeStatus("All stuff is disabled");
+ Assert.assertFalse(isPresent("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][1]/div"), "Previous year button has NOT to be present");
+ Assert.assertFalse(isPresent("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][2]/div"), "Previous month button has NOT to be present");
+ Assert.assertFalse(isPresent("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][3]/div"), "Next month button has NOT to be present");
+ Assert.assertFalse(isPresent("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][4]/div"), "Next year button has NOT to be present");
+
+ String footerText = selenium.getText("//td[@id='" + calendarFooterId + "']/table/tbody/tr");
+ Assert.assertFalse(footerText.matches(".*Today.*"), "Today button should NOT be present");
+ Assert.assertFalse(footerText.matches(".*Clean.*"), "Clean button should NOT be present");
+
+ String expectedHTML = getHTMLById(calendarId);
+ writeStatus("Convulsively click all over the calendar. The component has not to be changed it is disabled, remember?!");
+ clickById(calendarId + "DayCell6");
+ String actualHTML = getHTMLById(calendarId);
+ Assert.assertEquals(actualHTML, expectedHTML);
+ clickById(calendarId + "DayCell17");
+ actualHTML = getHTMLById(calendarId);
+ Assert.assertEquals(actualHTML, expectedHTML);
+
+ clickById(calendarId + "DayCell26");
+ actualHTML = getHTMLById(calendarId);
+ Assert.assertEquals(actualHTML, expectedHTML);
+ }
+
+ @Test
public void testTodayControlMode(Template template) {
renderPage(TODAY_CONTROL_MODE_URL, template, null);
initIds(getParentId());
17 years, 5 months
JBoss Rich Faces SVN: r11831 - in trunk/ui/core/src/test: resources/org/ajax4jsf/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-16 12:31:52 -0500 (Tue, 16 Dec 2008)
New Revision: 11831
Added:
trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java
trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml
trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
Log:
https://jira.jboss.org/jira/browse/RF-5375
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java 2008-12-16 17:31:52 UTC (rev 11831)
@@ -52,7 +52,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 600, 1600, false);
+ checkRequestData(dataList.get(0), "firstForm:queuedDefaultPoll", 600, 1600, false);
}
public void testQueuedPollRequestDelay() throws Exception {
@@ -63,7 +63,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 300, 1300, false);
+ checkRequestData(dataList.get(0), "firstForm:queuedDelayedPoll", 300, 1300, false);
}
public void testDelayedQueueDefaultPollRequestDelay() throws Exception {
@@ -74,7 +74,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 1500, 2500, false);
+ checkRequestData(dataList.get(0), "secondForm:delayedQueueDefaultPoll", 1500, 2500, false);
}
public void testDelayedQueuePollRequestDelay() throws Exception {
@@ -85,7 +85,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 2400, 3400, false);
+ checkRequestData(dataList.get(0), "secondForm:delayedQueueDelayedPoll", 2400, 3400, false);
}
public void testUnqueuedDefaultPollRequestDelay() throws Exception {
@@ -96,7 +96,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 700, 1700, false);
+ checkRequestData(dataList.get(0), "thirdForm:unqueuedDefaultPoll", 700, 1700, false);
}
public void testunQueuedPollRequestDelay() throws Exception {
@@ -107,6 +107,65 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 950, 1950, false);
+ checkRequestData(dataList.get(0), "thirdForm:unqueuedDelayedPoll", 950, 1950, false);
}
+
+ public void testDropNextDroppedPoll() throws Exception {
+ setFlag("renderDropNext");
+ renderView("/queue-poll-drop.xhtml");
+
+ ParametersBuilder parametersBuilder = createAjaxParameters().eventsQueue("dropNextQueue").
+ requestDelay(0);
+
+ ajax(0, "a", parametersBuilder.similarityGroupingId(1).requestTime(3000));
+
+ //poll has 2000 interval, so ajax request at 2100 will make queue drop it from list
+ ajax(2500, "b", parametersBuilder.similarityGroupingId(2).requestTime(500));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(3, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "b", 3000, 3500, false);
+
+ //poll has been kicked from queue at 2500, requeued in 2000
+ checkRequestData(dataList.get(2), "firstForm:poll", 2500 + 2000, 2500 + 2000 + 1000 /* default request time */,
+ false);
+ }
+
+ public void testDropNextDroppedPollSingle() throws Exception {
+ setFlag("renderDropNextSingle");
+ renderView("/queue-poll-drop.xhtml");
+
+ ajax(0, "a", createAjaxParameters().requestTime(3000).requestDelay(0).eventsQueue("dropNextQueueSingle"));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(2, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "thirdForm:poll", 4000, 5000, false);
+ }
+
+ public void testDropNewDroppedPoll() throws Exception {
+ setFlag("renderDropNew");
+ renderView("/queue-poll-drop.xhtml");
+
+ ParametersBuilder parametersBuilder = createAjaxParameters().eventsQueue("dropNewQueue").
+ requestDelay(0);
+
+ ajax(0, "a", parametersBuilder.similarityGroupingId(1).requestTime(3000));
+
+ //poll has 2500 interval, so ajax request at 2000 will make queue drop it from the list
+ ajax(2000, "b", parametersBuilder.similarityGroupingId(2).requestTime(500));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(3, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "b", 3000, 3500, false);
+ checkRequestData(dataList.get(2), "secondForm:poll", 5000, 6000, false);
+ }
}
Added: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml (rev 0)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml 2008-12-16 17:31:52 UTC (rev 11831)
@@ -0,0 +1,26 @@
+<html
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+ <body>
+ <f:view>
+ <a4j:queue size="2" name="dropNextQueue" sizeExceededBehavior="dropNext" />
+ <a4j:queue size="2" name="dropNewQueue" sizeExceededBehavior="dropNew" />
+ <a4j:queue size="1" name="dropNextQueueSingle" sizeExceededBehavior="dropNext" />
+
+ <h:form id="firstForm" rendered="#{renderDropNext}">
+ <a4j:poll interval="2000" id="poll" eventsQueue="dropNextQueue" />
+ </h:form>
+
+ <h:form id="secondForm" rendered="#{renderDropNew}">
+ <a4j:poll interval="2500" id="poll" eventsQueue="dropNewQueue" />
+ </h:form>
+
+ <h:form id="thirdForm" rendered="#{renderDropNextSingle}">
+ <a4j:poll interval="2000" id="poll" eventsQueue="dropNextQueueSingle" />
+ </h:form>
+
+ </f:view>
+ </body>
+</html>
Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml 2008-12-16 17:31:52 UTC (rev 11831)
@@ -6,21 +6,21 @@
<body>
<f:view>
- <h:form>
+ <h:form id="firstForm">
<a4j:queue />
<a4j:poll id="queuedDefaultPoll" enabled="#{queuedDefaultPollEnabled}" interval="600" />
<a4j:poll id="queuedDelayedPoll" enabled="#{queuedDelayedPollEnabled}" interval="200" requestDelay="100" />
</h:form>
- <h:form>
+ <h:form id="secondForm">
<a4j:queue requestDelay="10000" />
<a4j:poll id="delayedQueueDefaultPoll" enabled="#{delayedQueueDefaultPollEnabled}" interval="1500" />
<a4j:poll id="delayedQueueDelayedPoll" enabled="#{delayedQueueDelayedPollEnabled}" interval="2000" requestDelay="400" />
</h:form>
- <h:form>
+ <h:form id="thirdForm">
<a4j:poll id="unqueuedDefaultPoll" enabled="#{unqueuedDefaultPollEnabled}" interval="700" />
<a4j:poll id="unqueuedDelayedPoll" enabled="#{unqueuedDelayedPollEnabled}" interval="900" requestDelay="50" />
</h:form>
Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-12-16 17:31:52 UTC (rev 11831)
@@ -203,7 +203,7 @@
}
XMLHttpRequest.requestTime = options.requestTime || defaultRequestTime || DEFAULT_REQUEST_TIME;
- XMLHttpRequest.data = options.data || (event && event.srcElement.id);
+ XMLHttpRequest.data = options.data || (event && event.srcElement.id) || options.pollId;
try {
var req = oldSubmitQuery.apply(this, arguments);
17 years, 5 months
JBoss Rich Faces SVN: r11830 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-16 12:30:45 -0500 (Tue, 16 Dec 2008)
New Revision: 11830
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
https://jira.jboss.org/jira/browse/RF-5375
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-12-16 17:09:42 UTC (rev 11829)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-12-16 17:30:45 UTC (rev 11830)
@@ -617,6 +617,12 @@
};
}
+ if (!options.onqueuerequestdrop) {
+ options.onqueuerequestdrop = function() {
+ A4J.AJAX.Poll(containerId,form,options);
+ };
+ }
+
A4J.AJAX.SetZeroRequestDelay(options);
A4J.AJAX._pollers[options.pollId] = window.setTimeout(function(){
@@ -647,6 +653,11 @@
// For error, re-submit request.
A4J.AJAX.Push(containerId,form,options);
};
+
+ options.onqueuerequestdrop = function() {
+ LOG.debug("Push main request dropped from queue");
+ };
+
A4J.AJAX._pollers[options.pushId] = window.setTimeout(function(){
var request = new XMLHttpRequest();
request.onreadystatechange = function(){
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-12-16 17:09:42 UTC (rev 11829)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-12-16 17:30:45 UTC (rev 11830)
@@ -75,6 +75,13 @@
}
},
+ ondrop: function() {
+ var callback = this.options.onqueuerequestdrop;
+ if (callback) {
+ callback.call(this.queue, this.query, this.options, this.event);
+ }
+ },
+
onRequestDelayPassed: function() {
this.readyToSubmit = true;
this.queue.submitFirst();
@@ -263,6 +270,8 @@
if (b == DROP_NEW) {
LOG.debug("Queue '" + this.name + "' is going to drop new item");
+ entry.ondrop();
+
handled = true;
} else if (b == DROP_NEXT) {
LOG.debug("Queue '" + this.name + "' is going to drop [" + nextIdx + "] item that is the next one");
@@ -270,9 +279,15 @@
var nextEntry = this.items.splice(nextIdx, 1)[0];
if (nextEntry) {
LOG.debug("Item dropped from queue");
+
nextEntry.stopTimer();
+
+ nextEntry.ondrop();
} else {
LOG.debug("There's no such item, will handle new request instead");
+
+ entry.ondrop();
+
handled = true;
}
} else if (b == FIRE_NEW) {
17 years, 5 months
JBoss Rich Faces SVN: r11829 - in trunk/test-applications/seleniumTest/richfaces/src/main: webapp/pages/message and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-12-16 12:09:42 -0500 (Tue, 16 Dec 2008)
New Revision: 11829
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/messagesBase.xhtml
Log:
Refactor messages test
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java 2008-12-16 17:09:17 UTC (rev 11828)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java 2008-12-16 17:09:42 UTC (rev 11829)
@@ -31,9 +31,9 @@
private String string;
- private String string2;
+ private String secondInputString;
- private String string3;
+ private String thirdInputString;
private Boolean rendered;
@@ -49,8 +49,8 @@
public void init() {
string = "something";
- string2 = "something2";
- string3 = "something3";
+ secondInputString = "something2";
+ thirdInputString = "something3";
rendered = true;
showDetail = true;
showSummary = false;
@@ -124,31 +124,32 @@
}
/**
- * @return the string2
+ * @return the secondInputString
*/
- public String getString2() {
- return string2;
+ public String getSecondInputString() {
+ return secondInputString;
}
/**
- * @param string2 the string2 to set
+ * @param secondInputString the secondInputString to set
*/
- public void setString2(String string2) {
- this.string2 = string2;
+ public void setSecondInputString(String secondInputString) {
+ this.secondInputString = secondInputString;
}
/**
- * @return the string3
+ * @return the thirdInputString
*/
- public String getString3() {
- return string3;
+ public String getThirdInputString() {
+ return thirdInputString;
}
/**
- * @param string3 the string3 to set
+ * @param thirdInputString the thirdInputString to set
*/
- public void setString3(String string3) {
- this.string3 = string3;
+ public void setThirdInputString(String thirdInputString) {
+ this.thirdInputString = thirdInputString;
}
+
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/messagesBase.xhtml
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Rich Faces SVN: r11828 - trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-16 12:09:17 -0500 (Tue, 16 Dec 2008)
New Revision: 11828
Modified:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
Log:
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Rich Faces SVN: r11827 - in trunk/test-applications/realworld/web/src/main: java/org/richfaces/realworld/slideshow and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-16 12:07:43 -0500 (Tue, 16 Dec 2008)
New Revision: 11827
Modified:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
Log:
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,6 +1,7 @@
package org.richfaces.realworld.session;
import java.io.IOException;
+import java.io.Serializable;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -30,7 +31,7 @@
@Name("authenticator")
@Scope(ScopeType.CONVERSATION)
-public class Authenticator
+public class Authenticator implements Serializable
{
@Logger Log log;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,5 +1,7 @@
package org.richfaces.realworld.slideshow;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -10,7 +12,7 @@
@Name("slideshow")
@Scope(ScopeType.CONVERSATION)
-public class SlideshowBean {
+public class SlideshowBean implements Serializable{
@In(required=false) @Out(required=false)
SlideshowHelper slideshowHelper;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -15,6 +15,8 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Comment;
import org.richfaces.realworld.domain.FriendshipRequest;
@@ -83,7 +85,7 @@
public void setSelectedAlbumName(String selectedAlbumName) {
this.selectedAlbumName = selectedAlbumName;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addAlbum(){
albumAction.addAlbum(album);
treeRoot.getAvailableAlbums().add(new SelectItem(album.getName()));
@@ -94,12 +96,12 @@
selectedAlbum = albumItem.getAlbum();
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public List<String> availableUserLogins(Object suggest){
List<String> suggestions = userAction.getUsers((String)suggest);
return suggestions;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editAlbum(Album album){
boolean nameChanged = !album.getName().equals(album.getChangedName());
if(nameChanged){
@@ -118,7 +120,7 @@
treeRoot.updateChild(album);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void deleteAlbum(Album album){
String albumName = album.getName();
albumAction.deleteAlbum(album);
@@ -129,7 +131,7 @@
selectedAlbum = user.getChildAlbums().get(0);
selectedImage = selectedAlbum.getImages().get(0);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void deleteImage(Image image){
int index = image.getAlbum().getIndex(image);
String albumName = image.getAlbum().getName();
@@ -144,7 +146,7 @@
selectedImage = selectedAlbum.getImages().get(index-1);
}
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editImage(Image image){
TreeAlbumItem parent = treeRoot.getAlbums().get(image.getAlbum().getId());
boolean parentChanged = !parent.getAlbum().getName().equals(image.getAlbumName());
@@ -165,17 +167,17 @@
imageItem.setImage(image);
}
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void resetImage(Image image){
image = imageAction.resetImage(image);
selectedImage = image;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void resetAlbum(Album album){
album = albumAction.resetAlbum(album);
selectedAlbum = album;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
@Observer("addImage")
public void addImage(Image image) {
imageAction.addImage(image);
@@ -185,15 +187,15 @@
selectedImage = imageItem.getImage();
selectedAlbum = albumItem.getAlbum();
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editComment(Comment comment) {
imageAction.editComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addComment(Comment comment) {
imageAction.addComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addAutoComment(Image image) {
Comment comment = new Comment();
comment.setAuthor(user);
@@ -202,16 +204,16 @@
comment.setMessage("+1");
imageAction.addComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void sendMessage(Message message) {
messageAction.sendMessage(message);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public Long getCountUnreadedMessages() {
Long count = userAction.countNotReadedMessages(user);
return count!= null? count:0;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void removeFromFriends(User owner, User removed){
userAction.removeFromFriends(owner, removed);
Message message = new Message();
@@ -224,7 +226,7 @@
message.setTheme("You are were removed from friends");
messageAction.sendMessage(message);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addToFriends(User friend){
FriendshipRequest request = friend.getFriendshipRequest(user, friend);
if(request != null){
@@ -244,20 +246,20 @@
throw new Exception("This user won't be your friend!");
}*/
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addToSharedAlbums(Image image){
userAction.addSharedAlbum(image.getAlbum());
}
- @Begin(join=true)
+ @Transactional(TransactionPropagationType.REQUIRED)
public void removeFromSharedAlbums(Album album){
userAction.removeFromSharedAlbums(user, album);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void vote(Image image){
imageAction.vote(image, (Long)Long.valueOf(ratingHelper.getInputSlider().getValue().toString()));
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void showSharedAlbum(Image image){
NavigationEnum mainArea = NavigationEnum.IMAGE_PREVIEW;
treeSelectionManager.setMainArea(mainArea);
@@ -267,7 +269,7 @@
selectedImageIndex.setSelectedImageIndex(1);
}
- @Begin(join=true)
+ @Transactional(TransactionPropagationType.REQUIRED)
public void updateSelectedAlbum(){
selectedAlbum = user.getAlbumByName(this.getSelectedAlbumName());
selectedImage = selectedAlbum.getImages().get(0);
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -28,6 +28,8 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Synchronized;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.component.UIDatascroller;
import org.richfaces.component.UIDragSupport;
import org.richfaces.component.UITree;
@@ -47,7 +49,7 @@
@Name("treeSelectionManager")
@Scope(ScopeType.CONVERSATION)
-@Synchronized(timeout=2000)
+@Synchronized(timeout=200000)
public class TreeSelectionManager implements Serializable{
@In(required=false)
@@ -61,13 +63,13 @@
@In(required=false) @Out(required=false)
private Album selectedAlbum;
- @In(create=true) @Out(required=false)
+ @In(required=false) @Out(required=false)
private SelectedImageIndex selectedImageIndex;
@In(create=true)
FileManager fileManager;
- @In(create=true)
+ @In(required=false)
TreeActionManager treeActionManager;
private String nodeTitle;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,21 +1,25 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
@Name("friendHelper")
-(a)Scope(ScopeType.CONVERSATION)
-public class FriendHelper {
+(a)Scope(ScopeType.SESSION)
+public class FriendHelper implements Serializable{
@Out(required=false)
private User selectedUser;
@@ -26,7 +30,7 @@
@In(required=false) @Out(required=false)
private Album selectedAlbum;
- @In(create=true) @Out(required=false)
+ @In(required=false) @Out(required=false)
private SelectedImageIndex selectedImageIndex;
private String albumName;
@@ -47,6 +51,7 @@
return albumNames;
}
+ @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(User friend){
selectedUser = friend;
@@ -55,6 +60,7 @@
selectedImageIndex.setSelectedImageIndex(1);
}
+ @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(Album album){
selectedUser = album.getOwner();
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -8,6 +8,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.Serializable;
import javax.imageio.ImageIO;
@@ -22,7 +23,7 @@
@Name("imageLoader")
@Scope(ScopeType.CONVERSATION)
-public class ImageLoader {
+public class ImageLoader implements Serializable{
@In(create=true)
FileManager fileManager;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,12 +1,14 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@Name(value="navigationHelper")
@Scope(ScopeType.CONVERSATION)
-public class NavigationHelper {
+public class NavigationHelper implements Serializable{
private NavigationEnum navigationEnum;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,12 +1,14 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@Name("selectedImageIndex")
@Scope(ScopeType.CONVERSATION)
-public class SelectedImageIndex {
+public class SelectedImageIndex implements Serializable{
private Integer selectedImageIndex = 1;
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Rich Faces SVN: r11826 - in trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes: simple/skins/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-12-16 11:36:32 -0500 (Tue, 16 Dec 2008)
New Revision: 11826
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/dialog.xcss
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/content.xcss
Log:
https://jira.jboss.org/jira/browse/RF-5291
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss 2008-12-16 16:33:53 UTC (rev 11825)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/content.xcss 2008-12-16 16:36:32 UTC (rev 11826)
@@ -22,7 +22,7 @@
<u:selector name="body, td, pre">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="font-size" value="10px"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
<u:selector name="body">
@@ -32,7 +32,7 @@
<u:selector name="body.mceForceColors">
<u:style name="color" skin="generalTextColor"/>
<u:style name="background" skin="tableBackgroundColor"/>
- <u:style name="font-size" value="10px"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
<u:selector name=".mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid">
@@ -40,7 +40,7 @@
<u:style name="border-style" value="dashed"/>
<u:style name="border-color" skin="tableBorderColor"/>
<u:style name="background" skin="tableBackgroundColor"/>
- <u:style name="font-size" value="10px"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
<u:selector name="a.mceItemAnchor">
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/dialog.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/dialog.xcss 2008-12-16 16:33:53 UTC (rev 11825)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/dialog.xcss 2008-12-16 16:36:32 UTC (rev 11826)
@@ -154,7 +154,7 @@
<u:selector name="input, select, textarea">
<u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="font-size" value="10px"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
<u:selector name="input, select, textarea">
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/content.xcss
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/content.xcss 2008-12-16 16:33:53 UTC (rev 11825)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/content.xcss 2008-12-16 16:36:32 UTC (rev 11826)
@@ -11,7 +11,7 @@
<u:selector name="body, td, pre">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="font-size" value="10px"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
<u:selector name="body">
17 years, 5 months
JBoss Rich Faces SVN: r11825 - Reports/3.3.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-12-16 11:33:53 -0500 (Tue, 16 Dec 2008)
New Revision: 11825
Modified:
trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA4.xls
Log:
Modified: trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA4.xls
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Rich Faces SVN: r11824 - Reports/3.3.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-12-16 11:23:53 -0500 (Tue, 16 Dec 2008)
New Revision: 11824
Modified:
trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA4.xls
Log:
Modified: trunk/test-applications/qa/Test Reports/3.3.0/ComponentsAssignment3.3.0.BETA4.xls
===================================================================
(Binary files differ)
17 years, 5 months