JBoss Rich Faces SVN: r8396 - trunk/ui/datascroller/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-01 18:43:59 -0400 (Thu, 01 May 2008)
New Revision: 8396
Modified:
trunk/ui/datascroller/src/main/config/component/datascroller.xml
Log:
http://jira.jboss.com/jira/browse/RF-2923
Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml
===================================================================
--- trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-05-01 20:14:23 UTC (rev 8395)
+++ trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-05-01 22:43:59 UTC (rev 8396)
@@ -77,7 +77,7 @@
<classname>boolean</classname>
<description>If "false", this component is not rendered</description>
</property>
- <property el="false">
+ <property>
<name>for</name>
<classname>java.lang.String</classname>
<description>ID of the table component whose data is scrollled
15 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r8395 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-01 16:14:23 -0400 (Thu, 01 May 2008)
New Revision: 8395
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-3318
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-05-01 18:54:45 UTC (rev 8394)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-05-01 20:14:23 UTC (rev 8395)
@@ -296,7 +296,9 @@
var _this = this;
window.setTimeout(function() {
for (var i = 0; i < newscripts.length; i++){
- var newscript = Sarissa.getText( newscripts[i],true ) ; // TODO - Mozilla disable innerHTML in XML page ..."";
+ var includeComments = !A4J.AJAX.isXhtmlScriptMode();
+ var newscript = A4J.AJAX.getText(newscripts[i], includeComments) ; // TODO - Mozilla disable innerHTML in XML page ..."";
+
try {
LOG.debug("Evaluate script replaced area in document: ", newscript);
if (window.execScript) {
@@ -1410,3 +1412,58 @@
} catch(e){ /* Mozilla in XHTML mode not have innerHTML */ };
},0);
}
+
+A4J.AJAX.getText = function(oNode, includeComment) {
+ var s = "";
+ var nodes = oNode.childNodes;
+ for(var i=0; i < nodes.length; i++){
+ var node = nodes[i];
+ var nodeType = node.nodeType;
+
+ if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE ||
+ (includeComment && nodeType == Node.COMMENT_NODE)){
+
+ s += node.data;
+ } else if(nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE){
+ s += arguments.callee(node, includeComment);
+ }
+ }
+ return s;
+}
+
+A4J.AJAX.isXhtmlScriptMode = function() {
+ if (!this._xhtmlScriptMode) {
+ var elt = document.createElement("div");
+ elt.innerHTML = "<script type='text/javascript'><!--\r\n/**/\r\n//--></script>";
+
+ var commentFound = false;
+ var s = elt.firstChild;
+
+ while (s) {
+ if (s.nodeType == Node.ELEMENT_NODE) {
+ var c = s.firstChild;
+
+ while (c) {
+ if (c.nodeType == Node.COMMENT_NODE) {
+ commentFound = true;
+ break;
+ }
+
+ c = c.nextSibling;
+ }
+
+ break;
+ }
+
+ s = s.nextSibling;
+ }
+
+ if (commentFound) {
+ this._xhtmlScriptMode = 2;
+ } else {
+ this._xhtmlScriptMode = 1;
+ }
+ }
+
+ return this._xhtmlScriptMode > 1;
+}
15 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r8394 - in trunk: samples/seamEAR and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-05-01 14:54:45 -0400 (Thu, 01 May 2008)
New Revision: 8394
Modified:
trunk/samples/pom.xml
trunk/samples/seamEAR/pom.xml
trunk/test-applications/seleniumTest/pom.xml
trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
Log:
Fix selenium integration test for an unix environment.
Remove optional samples from default build profile.
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/samples/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
@@ -27,7 +29,8 @@
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
+ implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -91,10 +94,10 @@
<version>0.9.5</version>
<scope>runtime</scope>
<exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -361,7 +364,7 @@
<tomahawk>1.1.6</tomahawk>
</properties>
<build>
- <plugins/>
+ <plugins />
</build>
<dependencies>
<dependency>
@@ -409,11 +412,6 @@
</profile>
<profile>
<id>seam</id>
- <activation>
- <property>
- <name>seamHome</name>
- </property>
- </activation>
<modules>
<module>seamEAR</module>
<module>seamIntegration</module>
@@ -434,9 +432,9 @@
false
</includesTestSourceRoots>
<jdk>1.5</jdk>
- <excludes>
+ <excludes>
<exclude>**/*.java</exclude>
- </excludes>
+ </excludes>
</configuration>
</plugin>
<plugin>
@@ -451,54 +449,56 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>allSamples</id>
+ <modules>
+ <module>separator-sample</module>
+ <module>panel-sample</module>
+ <module>gmap-sample</module>
+ <module>togglePanel-sample</module>
+ <module>tabPanelDemo</module>
+ <module>simpleTogglePanel-sample</module>
+ <module>inputNumberSpinnerDemo</module>
+ <module>inputNumberSliderDemo</module>
+ <module>panelbar-sample</module>
+ <module>toolBarDemo</module>
+ <module>tree-demo</module>
+ <module>dataFilterSliderDemo</module>
+ <module>suggestionbox-sample</module>
+ <module>dragDropDemo</module>
+ <module>dataTableDemo</module>
+ <module>modalpanel-sample</module>
+ <module>datascroller-sample</module>
+ <module>effect-sample</module>
+ <module>dropdownmenu-sample</module>
+ <module>tooltip-sample</module>
+ <module>calendar-sample</module>
+ <module>treeModelDemo</module>
+ <module>local-value-demo</module>
+ <module>panelmenu-sample</module>
+ <module>rich-message-demo</module>
+ <module>scrollableDataTableDemo</module>
+ <module>richfaces-ear-demo</module>
+ <module>contextMenuDemo</module>
+ <module>orderingListDemo</module>
+ <module>listShuttleDemo</module>
+ <module>columnsDemo</module>
+ <module>combobox-sample</module>
+ <module>pickList-sample</module>
+ <module>progressBarDemo</module>
+ <module>jira-data</module>
+ <module>stdcomponents-sample</module>
+ <module>fileUploadDemo</module>
+ <module>sortingFilteringDemo</module>
+ <module>inplaceInput-sample</module>
+ <module>inplaceSelect-sample</module>
+ <module>functions-demo</module>
+ </modules>
+ </profile>
</profiles>
<modules>
<module>skins</module>
- <module>separator-sample</module>
- <module>panel-sample</module>
- <module>gmap-sample</module>
- <module>togglePanel-sample</module>
- <module>tabPanelDemo</module>
- <module>simpleTogglePanel-sample</module>
- <module>inputNumberSpinnerDemo</module>
- <module>inputNumberSliderDemo</module>
- <module>panelbar-sample</module>
- <module>toolBarDemo</module>
- <module>tree-demo</module>
- <module>dataFilterSliderDemo</module>
- <module>suggestionbox-sample</module>
- <module>dragDropDemo</module>
- <module>dataTableDemo</module>
- <module>modalpanel-sample</module>
- <module>datascroller-sample</module>
- <module>effect-sample</module>
+ <module>laguna</module>
<module>richfaces-demo</module>
- <module>dropdownmenu-sample</module>
- <module>tooltip-sample</module>
- <module>calendar-sample</module>
- <module>treeModelDemo</module>
- <module>local-value-demo</module>
- <module>panelmenu-sample</module>
- <module>rich-message-demo</module>
- <module>scrollableDataTableDemo</module>
- <module>richfaces-ear-demo</module>
- <module>seamEAR</module>
-
- <module>contextMenuDemo</module>
- <module>orderingListDemo</module>
- <module>listShuttleDemo</module>
- <module>columnsDemo</module>
-
- <module>combobox-sample</module>
- <module>pickList-sample</module>
- <module>progressBarDemo</module>
- <module>jira-data</module>
- <module>stdcomponents-sample</module>
- <module>fileUploadDemo</module>
- <module>sortingFilteringDemo</module>
- <module>inplaceInput-sample</module>
- <module>inplaceSelect-sample</module>
- <module>functions-demo</module>
- <module>laguna</module>
- </modules>
+ </modules>
</project>
Modified: trunk/samples/seamEAR/pom.xml
===================================================================
--- trunk/samples/seamEAR/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/samples/seamEAR/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -1,11 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
<parent>
- <artifactId>samples</artifactId>
+ <artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
<version>3.2.1-SNAPSHOT</version>
</parent>
- -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<version>3.2.1-SNAPSHOT</version>
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-05-01 18:54:45 UTC (rev 8394)
@@ -32,22 +32,6 @@
<finalName>seleniumTest</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <debug>false</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>0.3.1</version>
@@ -129,6 +113,32 @@
</os>
</activation>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <id>xvfb</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>xvfb</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <debug>false</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<directory>src/test/testng/unix</directory>
@@ -146,6 +156,25 @@
</os>
</activation>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <debug>false</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<directory>src/test/testng/win</directory>
Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-01 01:11:18 UTC (rev 8393)
+++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-05-01 18:54:45 UTC (rev 8394)
@@ -14,16 +14,16 @@
template = name;
}
- public static Templates SIMPLE = new Templates("Simple");
+ public static Templates SIMPLE = new Templates("simple");
- public static Templates DATATABLE = new Templates("DataTable");
+ public static Templates DATATABLE = new Templates("dataTable");
- public static Templates MODALPANEL = new Templates("ModalPanel");
+ public static Templates MODALPANEL = new Templates("dodalPanel");
private void setParentId(SeleniumTestBase test) {
- if ("Simple".equals(template)) {
+ if ("simple".equals(template)) {
test.setParentId(COMPONENT_PREFIX_SIMPLE);
- } else if ("DataTable".equals(template)) {
+ } else if ("dataTable".equals(template)) {
test.setParentId(COMPONENT_PREFIX_INSIDE_TABLE);
}
}
15 years, 12 months
- 1
- 0
JBoss Rich Faces SVN: r8393 - in branches/3.1.x: samples and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-30 21:11:18 -0400 (Wed, 30 Apr 2008)
New Revision: 8393
Removed:
branches/3.1.x/extensions/portlet/
branches/3.1.x/extensions/portletbridge/
branches/3.1.x/samples/ajaxPortlet/
branches/3.1.x/samples/seamPortletEar/
Modified:
branches/3.1.x/extensions/pom.xml
branches/3.1.x/samples/pom.xml
branches/3.1.x/samples/useCases/src/main/java/org/ajax4jsf/Bean.java
branches/3.1.x/samples/useCases/src/main/resources/logging.properties
branches/3.1.x/samples/useCases/src/main/webapp/index.jsp
branches/3.1.x/samples/useCases/src/main/webapp/pages/repeater.jsp
Log:
remove obsolette portlet modules
Modified: branches/3.1.x/extensions/pom.xml
===================================================================
--- branches/3.1.x/extensions/pom.xml 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/extensions/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
@@ -11,6 +11,5 @@
<name>Richfaces extensions for a different environments</name>
<packaging>pom</packaging>
<modules>
- <module>portletbridge</module>
</modules>
</project>
\ No newline at end of file
Modified: branches/3.1.x/samples/pom.xml
===================================================================
--- branches/3.1.x/samples/pom.xml 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/samples/pom.xml 2008-05-01 01:11:18 UTC (rev 8393)
@@ -427,8 +427,6 @@
<module>orderingListDemo</module>
<module>listShuttleDemo</module>
<module>contextMenuDemo</module>
- <module>ajaxPortlet</module>
- <module>seamPortletEar</module>
<module>panelmenu-sample</module>
<module>rich-message-demo</module>
<!--
Modified: branches/3.1.x/samples/useCases/src/main/java/org/ajax4jsf/Bean.java
===================================================================
--- branches/3.1.x/samples/useCases/src/main/java/org/ajax4jsf/Bean.java 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/samples/useCases/src/main/java/org/ajax4jsf/Bean.java 2008-05-01 01:11:18 UTC (rev 8393)
@@ -29,6 +29,7 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
/**
* @author $Autor$
@@ -150,4 +151,14 @@
System.out.println("onChange2");
}
+
+ public String clearSession(){
+ ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
+ HttpSession session = (HttpSession) externalContext.getSession(false);
+ if(null != session){
+ session.setMaxInactiveInterval(2);
+ }
+ return null;
+ }
+
}
\ No newline at end of file
Modified: branches/3.1.x/samples/useCases/src/main/resources/logging.properties
===================================================================
--- branches/3.1.x/samples/useCases/src/main/resources/logging.properties 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/samples/useCases/src/main/resources/logging.properties 2008-05-01 01:11:18 UTC (rev 8393)
@@ -18,4 +18,4 @@
org.ajax4jsf.level=ALL
javax.enterprise.resource.webcontainer.jsf.level=INFO
com.exadel.level=ALL
-
\ No newline at end of file
+org.apache.commons.digester.level=INFO
\ No newline at end of file
Modified: branches/3.1.x/samples/useCases/src/main/webapp/index.jsp
===================================================================
--- branches/3.1.x/samples/useCases/src/main/webapp/index.jsp 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/samples/useCases/src/main/webapp/index.jsp 2008-05-01 01:11:18 UTC (rev 8393)
@@ -5,7 +5,7 @@
<head></head>
<body>
- <jsp:forward page="/faces/pages/index.jsf" />
+ <jsp:forward page="/faces/pages/index.jsp" />
</body>
</html>
\ No newline at end of file
Modified: branches/3.1.x/samples/useCases/src/main/webapp/pages/repeater.jsp
===================================================================
--- branches/3.1.x/samples/useCases/src/main/webapp/pages/repeater.jsp 2008-04-30 22:35:05 UTC (rev 8392)
+++ branches/3.1.x/samples/useCases/src/main/webapp/pages/repeater.jsp 2008-05-01 01:11:18 UTC (rev 8393)
@@ -1,20 +1,26 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-
-<html>
-<head>
-<title>AJAX TEST</title>
-</head>
-<body>
-<f:view>
- <h:form>
- <h:inputText value="#{bean.text}">
- <a4j:support event="onkeyup" reRender="repeater"/>
- </h:inputText>
- <h:outputText id="repeater" value="#{bean.text}" />
- </h:form>
-</f:view>
-</body>
-</html>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+
+<html>
+<head>
+<title>AJAX TEST</title>
+</head>
+<body>
+<f:view>
+ <h:form>
+ <h:panelGrid columns="3">
+ <h:inputText value="#{bean.text}">
+ <a4j:support event="onkeyup" reRender="repeater" />
+ </h:inputText>
+ <h:outputText id="repeater" value="#{bean.text}" />
+ <h:messages></h:messages>
+ <a4j:commandButton action="#{bean.notExist}" value="Generate error" />
+ <a4j:commandButton action="#{bean.clearSession}"
+ value="Clear a session" />
+ </h:panelGrid>
+ </h:form>
+</f:view>
+</body>
+</html>
15 years, 12 months
- 1
- 0