JBoss Rich Faces SVN: r9280 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-06-27 13:23:07 -0400 (Fri, 27 Jun 2008)
New Revision: 9280
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPush/
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPush/ajaxPushTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxPushTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
Log:
http://jira.jboss.com/jira/browse/RF-3778
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java 2008-06-27 17:23:07 UTC (rev 9280)
@@ -0,0 +1,88 @@
+package org.ajax4jsf.bean;
+
+import java.util.Date;
+import java.util.EventListener;
+import java.util.EventObject;
+
+import org.ajax4jsf.event.PushEventListener;
+
+public class AjaxPushTestBean implements Runnable {
+
+ private boolean enabled = false;
+
+ private Date startDate;
+
+ private PushEventListener listener;
+
+ private Thread thread;
+
+ private int eventsSent = 0;
+
+ /**
+ * Gets value of eventsSent field.
+ * @return value of eventsSent field
+ */
+ public int getEventsSent() {
+ return eventsSent;
+ }
+
+ /**
+ * Set a new value for eventsSent field.
+ * @param eventsSent a new value for eventsSent field
+ */
+ public void setEventsSent(int eventsSent) {
+ this.eventsSent = eventsSent;
+ }
+
+ public void addListener(EventListener listener) {
+ synchronized (listener) {
+ if (this.listener != listener) {
+ this.listener = (PushEventListener) listener;
+ }
+ }
+ }
+
+ public void run() {
+ while (thread != null) {
+ try {
+ long left = System.currentTimeMillis() - startDate.getTime();
+ if (left >= 60000) {
+ stop();
+ }
+ listener.onEvent(new EventObject(this));
+ eventsSent++;
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void start() {
+ if (thread == null) {
+ thread = new Thread(this);
+ thread.setDaemon(true);
+ thread.start();
+ startDate = new Date();
+ setEnabled(true);
+ }
+ }
+
+ public void stop() {
+ if (thread != null) {
+ startDate = null;
+ eventsSent = 0;
+ setEnabled(false);
+ thread = null;
+ }
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/AjaxPushTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-06-27 14:53:23 UTC (rev 9279)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-06-27 17:23:07 UTC (rev 9280)
@@ -165,7 +165,11 @@
<managed-bean-class>org.ajax4jsf.bean.A4JSupport</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
+ <managed-bean>
+ <managed-bean-name>ajaxPushBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.AjaxPushTestBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
<navigation-rule>
<from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
<navigation-case>
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPush/ajaxPushTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxPush/ajaxPushTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxPushTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxPushTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxPushTest.java 2008-06-27 17:23:07 UTC (rev 9280)
@@ -0,0 +1,83 @@
+package org.richfaces.testng;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class AjaxPushTest extends SeleniumTestBase {
+
+ @Test(dataProvider = "templates")
+ public void testAjaxPushComponent(Template template) throws Exception {
+ renderPage(template);
+
+ String parentId = getParentId() + "_form:";
+
+ String startBtnID = parentId + "startButton";
+ String stopBtnID = parentId + "stopButton";
+
+ String startPanelID = parentId + "startPanel";
+ String progressPanelID = parentId + "progressPanel";
+
+ writeStatus("Check layout before start pushing");
+
+ AssertRendered(startBtnID);
+ AssertRendered(startPanelID);
+
+ AssertNotRendered(stopBtnID);
+ AssertNotRendered(progressPanelID);
+
+ writeStatus("Start push component. Test bean has to start sending events to registered PushEventListener");
+
+ clickAjaxCommandAndWait(startBtnID);
+
+ writeStatus("Check layout after pushing started");
+
+ AssertNotRendered(startBtnID);
+ AssertNotRendered(startPanelID);
+
+ AssertRendered(stopBtnID);
+ AssertRendered(progressPanelID);
+
+ writeStatus("check whether push events are being fired");
+
+ int eventBefore = getEventsCount();
+
+ delay(3000);
+
+ int eventAfter = getEventsCount();
+
+ if(eventBefore >= eventAfter) {
+ Assert.fail("PushEvents are not fired");
+ }
+
+ writeStatus("stop pushing");
+
+ clickAjaxCommandAndWait(stopBtnID);
+
+ writeStatus("Check layout after pushing stopped");
+
+ AssertRendered(startBtnID);
+ AssertRendered(startPanelID);
+
+ AssertNotRendered(stopBtnID);
+ AssertNotRendered(progressPanelID);
+
+ }
+
+ private int getEventsCount() throws Exception {
+ String events = getTextById(getParentId() + "_form:events");
+ try {
+ return Integer.parseInt(events);
+ } catch (Exception e) {
+ Assert.fail("Quantity of sent events is not numeric :" + e.getMessage());
+ throw new Exception(e);
+ }
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/ajaxPush/ajaxPushTest.xhtml";
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxPushTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 10 months
JBoss Rich Faces SVN: r9279 - trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-06-27 10:53:23 -0400 (Fri, 27 Jun 2008)
New Revision: 9279
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java
Log:
Adjust test code
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java 2008-06-27 14:02:32 UTC (rev 9278)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java 2008-06-27 14:53:23 UTC (rev 9279)
@@ -7,7 +7,7 @@
package org.ajax4jsf.bean;
/**
- * TODO Class description goes here.
+ * A4JInclude Test Bean
* @author Alexandr Levkovsky
*
*/
15 years, 10 months
JBoss Rich Faces SVN: r9278 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-06-27 10:02:32 -0400 (Fri, 27 Jun 2008)
New Revision: 9278
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/ajaxIncludeTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
Log:
Add a4j:include selenium test
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java 2008-06-27 14:02:32 UTC (rev 9278)
@@ -0,0 +1,140 @@
+/*
+ * A4JIncludeTestBean.java Date created: 26.06.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.ajax4jsf.bean;
+
+/**
+ * TODO Class description goes here.
+ * @author Alexandr Levkovsky
+ *
+ */
+public class A4JIncludeTestBean {
+
+ private Integer include1Counter = 0;
+ private Integer include2Counter = 0;
+ private Integer include3Counter = 0;
+ private Boolean include3ChildRenderedFlag = true;
+ private Boolean include4RenderedFlag = true;
+ private String inputValue;
+
+ /**
+ * @return the inputValue
+ */
+ public String getInputValue() {
+ return inputValue;
+ }
+
+ /**
+ * @param inputValue the inputValue to set
+ */
+ public void setInputValue(String inputValue) {
+ this.inputValue = inputValue;
+ }
+
+ /**
+ * @return the include1Counter
+ */
+ public Integer getInclude1Counter() {
+ return include1Counter;
+ }
+
+ /**
+ * @param include1Counter the include1Counter to set
+ */
+ public void setInclude1Counter(Integer include1Counter) {
+ this.include1Counter = include1Counter;
+ }
+
+ /**
+ * @return the include2Counter
+ */
+ public Integer getInclude2Counter() {
+ return include2Counter;
+ }
+
+ /**
+ * @param include2Counter the include2Counter to set
+ */
+ public void setInclude2Counter(Integer include2Counter) {
+ this.include2Counter = include2Counter;
+ }
+
+ /**
+ * @return the include3Counter
+ */
+ public Integer getInclude3Counter() {
+ return include3Counter;
+ }
+
+ /**
+ * @param include3Counter the include3Counter to set
+ */
+ public void setInclude3Counter(Integer include3Counter) {
+ this.include3Counter = include3Counter;
+ }
+
+ /**
+ * @return the include4RenderedFlag
+ */
+ public Boolean getInclude4RenderedFlag() {
+ return include4RenderedFlag;
+ }
+
+ /**
+ * @param include4RenderedFlag the include4RenderedFlag to set
+ */
+ public void setInclude4RenderedFlag(Boolean include4RenderedFlag) {
+ this.include4RenderedFlag = include4RenderedFlag;
+ }
+
+
+
+ /**
+ * @return the include3ChildRenderedFlag
+ */
+ public Boolean getInclude3ChildRenderedFlag() {
+ return include3ChildRenderedFlag;
+ }
+
+ /**
+ * @param include3ChildRenderedFlag the include3ChildRenderedFlag to set
+ */
+ public void setInclude3ChildRenderedFlag(Boolean include3ChildRenderedFlag) {
+ this.include3ChildRenderedFlag = include3ChildRenderedFlag;
+ }
+
+ public String b1Action() {
+ include2Counter++;
+ return null;
+ }
+
+ public String b2Action() {
+ include1Counter++;
+ include2Counter++;
+ return null;
+ }
+
+ public String b3Action() {
+ include3Counter++;
+ include3ChildRenderedFlag = false;
+ return null;
+ }
+
+ public String b4Action() {
+ setInclude4RenderedFlag(include4RenderedFlag ? false : true);
+ return null;
+ }
+
+ public String reset() {
+ include1Counter = 0;
+ include2Counter = 0;
+ include3Counter = 0;
+ include3ChildRenderedFlag = true;
+ include4RenderedFlag = true;
+ return null;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JIncludeTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2008-06-27 14:00:51 UTC (rev 9277)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2008-06-27 14:02:32 UTC (rev 9278)
@@ -24,18 +24,21 @@
public Boolean getPanel1VisibleFlag() {
return panel1VisibleFlag;
}
+
/**
* @param panel1VisibleFlag the panel1VisibleFlag to set
*/
public void setPanel1VisibleFlag(Boolean panel1VisibleFlag) {
this.panel1VisibleFlag = panel1VisibleFlag;
}
+
/**
* @return the panel2VisibleFlag
*/
public Boolean getPanel2VisibleFlag() {
return panel2VisibleFlag;
}
+
/**
* @param panel2VisibleFlag the panel2VisibleFlag to set
*/
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-06-27 14:00:51 UTC (rev 9277)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-06-27 14:02:32 UTC (rev 9278)
@@ -136,6 +136,11 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>a4jIncludeBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.A4JIncludeTestBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>calendarBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.bean.CalendarTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -160,4 +165,19 @@
<managed-bean-class>org.ajax4jsf.bean.A4JSupport</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+
+ <navigation-rule>
+ <from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/pages/ajaxInclude/step2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/pages/ajaxInclude/step2.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>previous</from-outcome>
+ <to-view-id>/pages/ajaxInclude/step1.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/ajaxIncludeTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/ajaxIncludeTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxIncludeTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxIncludeTest.java 2008-06-27 14:02:32 UTC (rev 9278)
@@ -0,0 +1,146 @@
+/*
+ * AjaxIncludeTest.java Date created: 26.06.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.richfaces.testng;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * ajaxInclude component sselenium test
+ * @author Alexandr Levkovsky
+ *
+ */
+public class AjaxIncludeTest extends SeleniumTestBase {
+
+ private final static String FORM1_ID = "form1:";
+ private final static String FORM2_ID = "form2:";
+
+ private final static String INCLUDE1_ID = "include1";
+ private final static String INCLUDE2_ID = "include2";
+ private final static String INCLUDE3_ID = "include3";
+ private final static String INCLUDE4_ID = "include4";
+
+ private final static String BUTTON4_ID = "b4";
+
+ private final static String INPUT_ID = "input";
+ private final static String OUTPUT_ID = "output";
+
+ private final static String NEXT_BUTTON_ID = "next";
+ private final static String PREVIOUS_BUTTON_ID = "previous";
+
+ private final static String RESET_BUTTON_ID = "reset";
+
+ private final static String STEP1_PANEL_ID = "step1_panel";
+ private final static String STEP2_PANEL_ID = "step2_panel";
+
+ /**
+ * @see org.richfaces.SeleniumTestBase#getTestUrl()
+ */
+ @Override
+ public String getTestUrl() {
+ return "pages/ajaxInclude/ajaxIncludeTest.xhtml";
+ }
+
+ @Test(dataProvider = "templates")
+ public void testAjaxInclude(Template template) throws Exception {
+ renderPage(template);
+ String include1Prefix = getParentId() + FORM2_ID + INCLUDE4_ID + ":";
+
+ AssertRendered(include1Prefix + STEP1_PANEL_ID);
+ AssertNotRendered(include1Prefix + STEP2_PANEL_ID);
+
+ String text = "1";
+ type(include1Prefix + INPUT_ID, text);
+ clickNext();
+
+ AssertRendered(include1Prefix + STEP2_PANEL_ID);
+ AssertNotRendered(include1Prefix + STEP1_PANEL_ID);
+ AssertTextEquals(include1Prefix + OUTPUT_ID, text);
+
+ clickPrevious();
+
+ AssertRendered(include1Prefix + STEP1_PANEL_ID);
+ AssertNotRendered(include1Prefix + STEP2_PANEL_ID);
+ AssertValueEquals(include1Prefix + INPUT_ID, text);
+
+ }
+
+ @Test(dataProvider = "templates")
+ public void testLayoutAttribute(Template template) throws Exception {
+ renderPage(template);
+ // inlude_1 has layout=inline(default)
+ // include_2 has layout=block
+ // include_3 has layout=none
+ writeStatus("Testing layout attribute...");
+
+ String inlude1Id = getParentId() + FORM1_ID + INCLUDE1_ID;
+ String inlude2Id = getParentId() + FORM1_ID + INCLUDE2_ID;
+ String inlude3Id = getParentId() + FORM1_ID + INCLUDE3_ID;
+
+ Assert.assertTrue(isPresentById(inlude1Id));
+ Number type = selenium.getXpathCount("//*[@id='" + inlude1Id + "' and (name()='span' or name()='SPAN')]");
+ Assert.assertTrue(type.intValue() == 1, "panel_1 has layout=inline(default) and should be 'span' element");
+
+ Assert.assertTrue(isPresentById(inlude2Id));
+ type = selenium.getXpathCount("//*[@id='" + inlude2Id + "' and (name()='DIV' or name()='div')]");
+ Assert.assertTrue(type.intValue() == 1, "panel_2 has layout=block and should be 'div' element");
+
+ // panel_3 has layout=none and should not present if a child component
+ // is rendered
+ Assert.assertFalse(isPresentById(inlude3Id), "panel_3 has layout=none and should not peresent if a child component is rendered ");
+
+ // // remove child component rendering
+ // writeStatus("Click button 3");
+ // String buttonId = getParentId() + FORM1_ID + BUTTON3_ID;
+ // clickById(buttonId);
+ // waitForAjaxCompletion();
+ //
+ // // panel_3 has layout=none and should present if no child component is
+ // // rendered with id of a child component and display:none style
+ // Assert.assertTrue(isPresentById(inlude3Id + "_text"), "panel_3 has layout=none and should peresent if no child component is rendered with id of a child component");
+ // Assert.assertFalse(isVisibleById(inlude3Id + "_text"), "panel_3 has layout=none and should peresent if no child component is rendered with display:none style");
+ clickReset();
+ }
+
+ @Test(dataProvider = "templates")
+ public void testRenderedAttribute(Template template) throws Exception {
+ renderPage(template);
+ writeStatus("Testing rendered attribute...");
+
+ String panelId = getParentId() + FORM2_ID + INCLUDE4_ID;
+
+ // panel_4 has rendered=true and should present on page
+ AssertRendered(panelId);
+
+ // change rendered attribute to false
+ writeStatus("Click button 4");
+ String buttonId = getParentId() + FORM2_ID + BUTTON4_ID;
+ clickCommandAndWait(buttonId);
+
+ // panel_4 has rendered=false and should not present on page
+ AssertNotRendered(panelId);
+ clickReset();
+ }
+
+ private void clickNext() {
+ String buttonId = getParentId() + FORM2_ID + INCLUDE4_ID + ":" + NEXT_BUTTON_ID;
+ clickAjaxCommandAndWait(buttonId);
+ }
+
+ private void clickPrevious() {
+ String buttonId = getParentId() + FORM2_ID + INCLUDE4_ID + ":" + PREVIOUS_BUTTON_ID;
+ clickAjaxCommandAndWait(buttonId);
+ }
+
+ private void clickReset() {
+ String buttonId = getParentId() + FORM1_ID + RESET_BUTTON_ID;
+ writeStatus("Click reset button");
+ clickCommandAndWait(buttonId);
+ }
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxIncludeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 10 months
JBoss Rich Faces SVN: r9277 - trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-06-27 10:00:51 -0400 (Fri, 27 Jun 2008)
New Revision: 9277
Added:
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include1.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step2.xhtml
Log:
Add a4j:include selenium test
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include1.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include1.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step2.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step2.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
15 years, 10 months
JBoss Rich Faces SVN: r9276 - in trunk/test-applications/seleniumTest/src/main/webapp/pages: ajaxInclude and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-06-27 10:00:00 -0400 (Fri, 27 Jun 2008)
New Revision: 9276
Added:
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include2.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include3.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step1.xhtml
Log:
Add a4j:include selenium test
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include2.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include2.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include3.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/include3.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step1.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxInclude/step1.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
15 years, 10 months
JBoss Rich Faces SVN: r9275 - trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-06-27 09:06:48 -0400 (Fri, 27 Jun 2008)
New Revision: 9275
Modified:
trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties
Log:
Modified: trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties
===================================================================
--- trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties 2008-06-27 12:38:28 UTC (rev 9274)
+++ trunk/sandbox/samples/darkX/src/main/resources/META-INF/skins/darkX.skin.properties 2008-06-27 13:06:48 UTC (rev 9275)
@@ -7,3 +7,13 @@
intShadow=#c0c0c0
newBorder=#ADADAD
generalTextColor=#474747
+
+selectListIconColor=#FFFFFF
+selectListIconBorderColor=#3F6EB3
+
+selectListDisabledIconColor=#ADADAD
+selectListDisabledIconBorderColor=#FFFFFF
+
+dataTableSortIconColor=#3F6EB3
+dataTableSortIconBorderColor=#FFFFFF
+
15 years, 10 months
JBoss Rich Faces SVN: r9274 - trunk/test-applications/jsp/src/main/java/rich.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-06-27 08:38:28 -0400 (Fri, 27 Jun 2008)
New Revision: 9274
Removed:
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
Log:
Deleted: trunk/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-06-27 11:56:46 UTC (rev 9273)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-06-27 12:38:28 UTC (rev 9274)
@@ -1,180 +0,0 @@
-package rich;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.richfaces.component.html.HtmlCalendar;
-import org.xml.sax.SAXException;
-
-//import util.RichComponent.RichComponent;
-//import util.RichComponent.RichHandler;
-
-//import org.richfaces.VersionBean;
-
-public class RichBean {
- private static final String EXT = ".jsp";
- private String version = "3.2.2"; //VersionBean.SCM_REVISION;
- private String src;
- private String srcContainer;
- private MapComponent map;
- private List<SelectItem> list;
-// private RichComponent richComponent = RichComponent.getInstance();
-
- public RichBean() {
-// try {
-// SAXParserFactory factory = SAXParserFactory.newInstance();
-// factory.setNamespaceAware(true);
-// SAXParser saxParser = factory.newSAXParser();
-// // InputStream in = new URL(url).openStream();
-// RichHandler handler = new RichHandler();
-// saxParser.parse(getClass().getResourceAsStream("richfaces.tld"), handler);
-// } catch (SAXException e) {
-// e.printStackTrace();
-// } catch (IOException e) {
-// e.printStackTrace();
-// } catch (ParserConfigurationException e) {
-// e.printStackTrace();
-// }
-
- list = new ArrayList<SelectItem>();
- src = "Blank";
- srcContainer = "Blank";
- map = new MapComponent();
- // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) );
- map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true, true}));
- map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true, true}));
- map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, true, false}));
- map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true, true}));
- map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true, true}));
- map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false, false}));
- map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {false, true, true}));
- map.add("Effect", add("/Effect/Effect", new boolean [] {false, false, false}));
- map.add("Gmap", add("/Gmap/Gmap", new boolean [] {false, true, false}));
- map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {false, true, true}));
- map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {false, true, true}));
- map.add("Insert", add("/Insert/Insert", new boolean [] {false, true, false}));
- map.add("Message", add("/Message/M essage", new boolean [] {false, true, true}));
- map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {false, true, true}));
- map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {false, true, true}));
- map.add("Panel", add("/Panel/Panel", new boolean [] {false, true, true}));
- map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {false, true, true}));
- map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {false, true, true}));
- map.add("Separator", add("/Separator/Separator", new boolean [] {false, true, true}));
- map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {false, true, true}));
- map.add("Spacer", add("/Spacer/Spacer", new boolean [] {false, true, true}));
- map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {false, true, true}));
- map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {false, true, true}));
- map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {false, true, true}));
- map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {false, true, false}));
- map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {false, true, true}));
- map.add("Tree", add("/Tree/Tree", new boolean [] {false, true, false}));
- map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {false, true, false}));
- map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {false, true, false}));
- map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false, false}));
- map.add("OrderingList", add("/OrderingList/OrderingList", new boolean [] {false, true, true}));
- map.add("DataDefinitionList", add("/DataDefinitionList/DataDefinitionList", new boolean [] {false, true, false}));
- map.add("DataOrderedList", add("/DataOrderedList/DataOrderedList", new boolean [] {false, true, false}));
- map.add("ContextMenu", add("/ContextMenu/ContextMenu", new boolean [] {false, true, false}));
- map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {false, true, true}));
- map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false, false}));
- map.add("Columns", add("/Columns/Columns", new boolean [] {false, true, false}));
- map.add("PickList", add("/PickList/PickList", new boolean [] {false, true, false}));
- map.add("Combobox", add("/Combobox/Combobox", new boolean [] {false, true, false}));
- map.add("ProgressBar", add("/ProgressBar/ProgressBar", new boolean [] {false, false, false}));
- map.add("SortingAndFiltering", add("/SortingAndFiltering/SortingAndFiltering", new boolean [] {false, false, false}));
- map.add("FileUpload", add("/FileUpload/FileUpload", new boolean [] {false, false, false}));
- map.add("InplaceSelect", add("/InplaceSelect/InplaceSelect", new boolean [] {false, true, false}));
- map.add("InplaceInput", add("/InplaceInput/InplaceInput", new boolean [] {false, true, false}));
- map.add("Skinning", add("/Skinning/Skinning", new boolean [] {false, false, false}));
- map.add("HotKey", add("/HotKey/HotKey", new boolean [] {false, false, false}));
- Iterator<String> iterator = map.getSet().iterator();
- while(iterator.hasNext()){
- list.add(new SelectItem(iterator.next()));
- }
- }
-
- public String getSrc() {
- return src;
- }
-
- public String getPathComponent() {
- return map.get(src).get(0);
- }
-
- public String getDefaultPathComponent() {
- return map.get(src).get(1);
- }
-
- public String getPathProperty() {
- return map.get(src).get(2);
- }
-
- public String getPathStraightforward() {
- return map.get(src).get(3);
- }
-
- public void setSrc(String src) {
- this.src = src;
- }
-
- private ArrayList<String> add(String path, boolean [] arr){
- ArrayList<String> list = new ArrayList<String>();
- list.add(path + EXT);
- if(arr[0]) list.add(path + "Default" + EXT); else list.add("/pages/Blank/BlankDefault" + EXT);
- if(arr[1]) list.add(path + "Property" + EXT); else list.add("/pages/Blank/BlankProperty" + EXT);
- if(arr[2]) list.add(path + "Straightforward" + EXT); else list.add("/pages/Blank/BlankStraightforward" + EXT);
- return list;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public List<SelectItem> getList(){
- return list;
- }
-
- public String getSrcContainer() {
- return srcContainer;
- }
-
- public void setSrcContainer(String srcContainer) {
- this.srcContainer = srcContainer;
- }
-
- public String getPathComponentContainer() {
- return map.get(srcContainer).get(0);
- }
-
- public List<SelectItem> getListContainer() {
- Iterator<String> iterator = map.getSet().iterator();
- List<SelectItem> l = new ArrayList<SelectItem>();
- String str;
- while(iterator.hasNext()){
- str = iterator.next();
- if(!str.equals(src))
- l.add(new SelectItem(str));
- }
- return l;
- }
-
- public String invalidateSession(){
- FacesContext context = FacesContext.getCurrentInstance();
- System.out.println("RichBean.invalidateSession()");
- return "RichFaces";
- }
-}
15 years, 10 months
JBoss Rich Faces SVN: r9273 - trunk/framework/impl/src/main/java/org/ajax4jsf/request.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-06-27 07:56:46 -0400 (Fri, 27 Jun 2008)
New Revision: 9273
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
Log:
RF-3746
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-06-27 11:41:11 UTC (rev 9272)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/request/MultipartRequest.java 2008-06-27 11:56:46 UTC (rev 9273)
@@ -334,7 +334,9 @@
encoding = request.getCharacterEncoding();
parameters = new HashMap<String, Param>();
- File file = null;
+
+ int loopCounter = 20; // 20 attempts to read not-readable data
+
this.percentMap = getProgressData();
try {
@@ -351,7 +353,7 @@
Param p = null;
- while (read != -1) {
+ while (read > 0 && loopCounter > 0) {
for (int i = 0; i < read; i++) {
switch (readState) {
case BOUNDARY: {
@@ -381,7 +383,7 @@
if (headers.containsKey(PARAM_FILENAME)) {
FileParam fp = new FileParam(paramName);
if (createTempFiles)
- file = fp.createTempFile();
+ fp.createTempFile();
fp.setContentType(headers
.get(PARAM_CONTENT_TYPE));
fp.setFilename(decodeFileName(headers
@@ -452,6 +454,9 @@
System.arraycopy(buffer, pos, buffer, 0, bytesNotRead);
read = input.read(buffer, bytesNotRead, buffer.length
- bytesNotRead);
+ if (read <= 0) {
+ loopCounter--;
+ }
read += bytesNotRead;
} else {
read = input.read(buffer);
15 years, 10 months
JBoss Rich Faces SVN: r9272 - in trunk/ui/hotKey/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-06-27 07:41:11 -0400 (Fri, 27 Jun 2008)
New Revision: 9272
Modified:
trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx
trunk/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-3795
Modified: trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx
===================================================================
--- trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-06-27 11:16:20 UTC (rev 9271)
+++ trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-06-27 11:41:11 UTC (rev 9272)
@@ -38,6 +38,12 @@
String type = (String) attributes.get("type");
if (type != null && type.length() != 0) {
options.append(",type:'");
+
+ if (type.startsWith("on")) {
+ // 2 is "on".length()
+ type = type.substring(2);
+ }
+
options.append(type);
options.append("'");
}
Modified: trunk/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java
===================================================================
--- trunk/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java 2008-06-27 11:16:20 UTC (rev 9271)
+++ trunk/ui/hotKey/src/test/java/org/richfaces/component/HotKeyComponentTest.java 2008-06-27 11:41:11 UTC (rev 9272)
@@ -163,7 +163,7 @@
public void testOptions2() throws Exception {
Map<String, Object> attributes = this.hotKey.getAttributes();
attributes.put("timing", "onload");
- attributes.put("type", "keyup");
+ attributes.put("type", "onkeyup");
attributes.put("propagate", Boolean.FALSE);
attributes.put("disableInInput", Boolean.TRUE);
attributes.put("checkParent", Boolean.FALSE);
15 years, 10 months
JBoss Rich Faces SVN: r9271 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-06-27 07:16:20 -0400 (Fri, 27 Jun 2008)
New Revision: 9271
Modified:
trunk/docs/userguide/en/src/main/docbook/included/gmap.xml
trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml
trunk/docs/userguide/en/src/main/docbook/included/inplaceSelect.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml
trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
trunk/docs/userguide/en/src/main/docbook/included/message.xml
trunk/docs/userguide/en/src/main/docbook/included/messages.xml
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml
trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
Log:
RF-672 - corrected names attributes, components and tags for gmap, virtualEarth, inplaceInput, inplaceSelect, inputNumberSlider, inputNumberSpinner, jQuery, listShuttle, message, messages, modalPanel and orderingList components.
Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -229,13 +229,13 @@
</para>
<itemizedlist>
<listitem>
- <para>onmouseover</para>
+ <para><emphasis><property>"onmouseover"</property></emphasis></para>
</listitem>
<listitem>
- <para>onclick</para>
+ <para><emphasis><property>"onclick"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseout</para>
+ <para><emphasis><property>"onmouseout"</property></emphasis></para>
</listitem>
<listitem>
<para>etc.</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -114,7 +114,7 @@
...]]> </programlisting>-->
<para>
In the example above the <emphasis><property>"value"</property></emphasis> attribute is not initialized
- therefore "click to edit" text, that
+ therefore "<code>click to edit</code>" text, that
<emphasis><property>"defaultLabel"</property></emphasis>, contains is displayed.
</para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inplaceSelect.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inplaceSelect.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/inplaceSelect.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -105,7 +105,7 @@
<para>
In the example above the <emphasis><property>"value"</property></emphasis> attribute is not initialized
- therefore "click to edit" text, that
+ therefore "<code>click to edit</code>" text, that
<emphasis><property>"defaultLabel"</property></emphasis>, contains is displayed.
</para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -95,7 +95,7 @@
<emphasis>
<property>"step"</property>
</emphasis>
- (on default = "1") attributes, which define the
+ (on default is "1") attributes, which define the
beginning and the end of a numerical area and a
<property>slider</property>
property step.
@@ -126,11 +126,11 @@
<emphasis>
<property>"showInput"</property>
</emphasis>
- (default is true) and
+ (default is "true") and
<emphasis>
<property>"enableManualInput"</property>
</emphasis>
- (default value is true) attributes, it's possible to
+ (default value is "true") attributes, it's possible to
output the input area near the slider, and make it read-only
or editable.
</para>
@@ -172,7 +172,7 @@
<property>"showToolTip"</property>
</emphasis>
which is responsible for tooltTip displaying (default is
- true).
+ "true").
</para>
<para>
@@ -181,19 +181,19 @@
</para>
<itemizedlist>
<listitem>
- <para>onchange</para>
+ <para><emphasis><property>"onchange"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseover</para>
+ <para><emphasis><property>"onmouseover"</property></emphasis></para>
</listitem>
<listitem>
- <para>onclick</para>
+ <para><emphasis><property>"onclick"</property></emphasis></para>
</listitem>
<listitem>
- <para>onfocus</para>
+ <para><emphasis><property>"onfocus"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseout</para>
+ <para><emphasis><property>"onmouseout"</property></emphasis></para>
</listitem>
<listitem>
<para>etc.</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -98,7 +98,7 @@
<emphasis>
<property>"step"</property>
</emphasis>
- (on default = "1") attributes, which define the
+ (on default is "1") attributes, which define the
beginning and the end of numerical area and a
<property>spinner</property>
step.
@@ -135,9 +135,7 @@
<property>"cycled"</property>
</emphasis>
if the attribute is
- <emphasis>
- <property>"true"</property>
- </emphasis>
+ "true"
after the current value reaches the border value
it's be reversed to another border value after next
increasing/decreasing. In other case possibilities
@@ -169,19 +167,19 @@
</para>
<itemizedlist>
<listitem>
- <para>onchange</para>
+ <para><emphasis><property>"onchange"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseover</para>
+ <para><emphasis><property>"onmouseover"</property></emphasis></para>
</listitem>
<listitem>
- <para>onclick</para>
+ <para><emphasis><property>"onclick"</property></emphasis></para>
</listitem>
<listitem>
- <para>onfocus</para>
+ <para><emphasis><property>"onfocus"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseout</para>
+ <para><emphasis><property>"onmouseout"</property></emphasis></para>
</listitem>
<listitem>
<para>etc.</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -91,8 +91,8 @@
<property>"timing"</property>
</emphasis> attribute that has the following options:</para>
<itemizedlist>
- <listitem><para>immediate - applying a query immediately</para></listitem>
- <listitem><para>onload - applying a query when a document is loaded</para></listitem>
+ <listitem><para>"immediate" - applying a query immediately</para></listitem>
+ <listitem><para>"onload" - applying a query when a document is loaded</para></listitem>
<listitem><para>onJScall - applying a query by invoked JavaScript function defined with the <emphasis>
<property>"name"</property>
</emphasis> attribute</para></listitem>
@@ -101,12 +101,12 @@
<property>"name"</property>
</emphasis> attribute is mandatory when the value of <emphasis>
<property>"timing"</property>
- </emphasis> attribute is <property>"onJScall"</property>. If the<emphasis>
+ </emphasis> attribute is "onJScall". If the<emphasis>
<property>"name"</property>
</emphasis> attribute is defined when <emphasis>
<property>"timing"</property>
- </emphasis> value equals to <property>"immediate"</property> or
- <property>"onload"</property>, the query is applied according to this
+ </emphasis> value equals to "immediate" or
+ "onload", the query is applied according to this
value, but you still have an opportunity to invoke it by a function name.</para>
<para>The <emphasis>
<property>"selector"</property>
@@ -309,13 +309,13 @@
</emphasis> components in the same Ajax interaction with the components these queries are
applied to. Note, that queries with <emphasis>
<property>"timing"</property>
- </emphasis> attribute set to <property>"onload"</property> are not
+ </emphasis> attribute set to "onload" are not
invoked even if the query is reRendered, because a DOM document is not fully reloaded during
the Ajax interaction. If you need to re-applies query with
- <property>"onload"</property> value of <emphasis>
+ "onload" value of <emphasis>
<property>"timing"</property>
</emphasis> attribute , define the <emphasis>
- <property>"name</property>
+ <property>"name"</property>
</emphasis> attribute and invoke the query by name in the <emphasis>
<property>"oncomplete"</property>
</emphasis> attribute of the Ajax component.</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -256,7 +256,7 @@
<property>none</property>.</para>
<note>
<para>
- Currently the button controls type is based on <div> element.
+ Currently the button controls type is based on <emphasis role="bold"><property><div></property></emphasis> element.
</para>
</note>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/message.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/message.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/message.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -82,24 +82,24 @@
</itemizedlist>
</para>
<para> A set of facets which can be used for marker defining: <itemizedlist>
- <listitem><para>passedMarker. This facet is provided to allow setting a marker to display if
+ <listitem><para><emphasis><property>"passedMarker"</property></emphasis>. This facet is provided to allow setting a marker to display if
there is no message</para></listitem>
- <listitem><para>errorMarker. This facet is provided to allow setting a marker to display if there
+ <listitem><para><emphasis><property>"errorMarker"</property></emphasis>. This facet is provided to allow setting a marker to display if there
is a message with a severity class of "ERROR"</para></listitem>
- <listitem><para>fatalMarker. This facet is provided to allow setting a marker to display if there
+ <listitem><para><emphasis><property>"fatalMarker"</property></emphasis>. This facet is provided to allow setting a marker to display if there
is a message with a severity class of "FATAL"</para></listitem>
- <listitem><para>infoMarker. This facet is provided to allow setting a marker to display if there
+ <listitem><para><emphasis><property>"infoMarker"</property></emphasis>. This facet is provided to allow setting a marker to display if there
is a message with a severity class of "INFO"</para></listitem>
- <listitem><para>warnMarker. This facet is provided to allow setting a marker to display if there
+ <listitem><para><emphasis><property>"warnMarker"</property></emphasis>. This facet is provided to allow setting a marker to display if there
is a message with a severity class of "WARN"</para></listitem>
</itemizedlist>
</para>
<para> The following example shows different variants for component customization. The
- attribute 'passedLabel' is used for definition of the label to display when no message
+ attribute <emphasis><property>"passedLabel"</property></emphasis> is used for definition of the label to display when no message
appears. But the message component doesn't appear before the form submission even when
state is defined as passed (on initial rendering). Boolean attribute<emphasis><property> "showSummary" </property></emphasis>defines possibility to
- display summary portion of displayed messages. The facets "errorMarker" and 'passedMarker' set
+ display summary portion of displayed messages. The facets <emphasis><property>"errorMarker"</property></emphasis> and <emphasis><property>"passedMarker"</property></emphasis> set
corresponding images for markers. </para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/messages.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -85,11 +85,11 @@
<para>The component provides two parts to be optionally defined: marker and informational label
before the marker for every message.</para>
<para> Set of facet which can be used for a marker defining: <itemizedlist>
- <listitem><para>passedMarker. This facet is provided to allow setting a marker to be displayed if there is no message.</para></listitem>
- <listitem><para>errorMarker. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "ERROR".</para></listitem>
- <listitem><para>fatalMarker. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "FATAL".</para></listitem>
- <listitem><para>infoMarker. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "INFO".</para></listitem>
- <listitem><para>warnMarker. This facet is provided to allow setting a marker to be displayed if there is an message with a severity class of "WARN".</para></listitem>
+ <listitem><para><emphasis><property>"passedMarker"</property></emphasis>. This facet is provided to allow setting a marker to be displayed if there is no message.</para></listitem>
+ <listitem><para><emphasis><property>"errorMarker"</property></emphasis>. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "ERROR".</para></listitem>
+ <listitem><para><emphasis><property>"fatalMarker"</property></emphasis>. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "FATAL".</para></listitem>
+ <listitem><para><emphasis><property>"infoMarker"</property></emphasis>. This facet is provided to allow setting a marker to be displayed if there is a message with a severity class of "INFO".</para></listitem>
+ <listitem><para><emphasis><property>"warnMarker"</property></emphasis>. This facet is provided to allow setting a marker to be displayed if there is an message with a severity class of "WARN".</para></listitem>
</itemizedlist>
</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -215,7 +215,7 @@
<property>"resizeable"</property>
</emphasis> and <emphasis>
<property>"moveable"</property>
- </emphasis> attributes to <emphasis><property>"true"</property></emphasis> or <emphasis><property>"false"</property></emphasis> values. Window
+ </emphasis> attributes to "true" or "false" values. Window
resizing is also limited by <emphasis>
<property>"minWidth"</property>
</emphasis> and <emphasis>
Modified: trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -222,17 +222,17 @@
<listitem><para><emphasis>
<property> "controlsHorizontalAlign"</property>
</emphasis> attribute. Possible values: <itemizedlist>
- <listitem><para>left - controls render to the left side of a list</para></listitem>
- <listitem><para>right(default) - controls render to the right side of a list</para></listitem>
- <listitem><para>center - controls is centered</para></listitem>
+ <listitem><para>"left" - controls render to the left side of a list</para></listitem>
+ <listitem><para>"right" (default) - controls render to the right side of a list</para></listitem>
+ <listitem><para>"center" - controls is centered</para></listitem>
</itemizedlist>
</para></listitem>
<listitem><para><emphasis>
<property> "controlsVerticalAlign"</property>
</emphasis> attribute. Possible values: <itemizedlist>
- <listitem><para>top - controls render aligned to the top side of a list </para></listitem>
- <listitem><para>bottom - controls render aligned to the bottom side of a list </para></listitem>
- <listitem><para>center(default) - controls is centered relatively to a list
+ <listitem><para>"top" - controls render aligned to the top side of a list </para></listitem>
+ <listitem><para>"bottom" - controls render aligned to the bottom side of a list </para></listitem>
+ <listitem><para>"center" (default) - controls is centered relatively to a list
</para></listitem>
</itemizedlist>
</para></listitem>
@@ -253,13 +253,13 @@
<listitem><para>
<emphasis>
<property>"orderControlsVisible"</property>
- </emphasis> attribute has two values: true or false. If false
+ </emphasis> attribute has two values: "true" or "false". If false
<property>Up</property> and <property>Down</property> controls are not
displayed.</para></listitem>
<listitem><para>
<emphasis>
<property>"fastOrderControlsVisible"</property>
- </emphasis> attribute has two values: true or false. If false
+ </emphasis> attribute has two values: "true" or "false". If false
<property>Top</property> and <property>Bottom</property> controls are not
displayed.</para></listitem>
</itemizedlist>
Modified: trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2008-06-27 11:14:59 UTC (rev 9270)
+++ trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2008-06-27 11:16:20 UTC (rev 9271)
@@ -177,13 +177,13 @@
</para>
<itemizedlist>
<listitem>
- <para>onmouseover</para>
+ <para><emphasis><property>"onmouseover"</property></emphasis></para>
</listitem>
<listitem>
- <para>onclick</para>
+ <para><emphasis><property>"onclick"</property></emphasis></para>
</listitem>
<listitem>
- <para>onmouseout</para>
+ <para><emphasis><property>"onmouseout"</property></emphasis></para>
</listitem>
<listitem>
<para>etc.</para>
15 years, 10 months