Author: alexsmirnov Date: 2007-07-31 19:22:14 -0400 (Tue, 31 Jul 2007) New Revision: 1967 Added: trunk/samples/seamIntegration/src/main/webapp/META-INF/ trunk/samples/seamIntegration/src/main/webapp/META-INF/MANIFEST.MF trunk/samples/useCases/src/main/webapp/pages/replaceTD.xhtml Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/framework/pom.xml trunk/samples/seamIntegration/pom.xml trunk/samples/seamIntegration/src/main/resources/logging.properties trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml Log: Fix AJSF-80 Attempt to restore seam application sample. Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-07-31 23:22:14 UTC (rev 1967) @@ -290,7 +290,7 @@ var anchor = oldnode.parentNode ; // need to check for firstChild due to opera 8 bug with hasChildNodes Sarissa.clearChildNodes(oldnode); - if(oldnode.outerHTML){ + if(oldnode.outerHTML && !oldnode.tagName.match( /(tbody|thead|tfoot|tr|th|td)/i ) ){ LOG.debug("Replace content of node by outerHTML()"); oldnode.outerHTML = new XMLSerializer().serializeToString(newnode); } else { Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/framework/pom.xml 2007-07-31 23:22:14 UTC (rev 1967) @@ -1,24 +1,77 @@ -<?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"> - <parent> - <artifactId>root</artifactId> - <groupId>org.richfaces</groupId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>framework</artifactId> +<?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"> + <parent> + <artifactId>root</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> <version>3.1.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Java Server Faces AJAX framework</name> - <dependencies /> + <packaging>pom</packaging> + <name>Java Server Faces AJAX framework</name> + <dependencies /> <build> - </build> - <modules> - <module>api-parent</module> - <module>api</module> - <module>impl-parent</module> - <module>impl</module> - <module>test</module> - </modules> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number> + ${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>api-parent</module> + <module>api</module> + <module>impl-parent</module> + <module>impl</module> + <module>test</module> + </modules> </project> \ No newline at end of file Modified: trunk/samples/seamIntegration/pom.xml =================================================================== --- trunk/samples/seamIntegration/pom.xml 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/samples/seamIntegration/pom.xml 2007-07-31 23:22:14 UTC (rev 1967) @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>samples</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> + <groupId>org.richfaces.samples</groupId> <artifactId>seamIntegration</artifactId> <packaging>war</packaging> <name>seamIntegration Maven Webapp</name> @@ -28,43 +28,72 @@ <dependencies> <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.3.0.ga</version> + </dependency> + <!-- + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.ga</version> - </dependency> + <version>3.3.0.ga</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.4.ga</version> + </dependency> + --> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.3.ga</version> + <artifactId>hibernate-validator</artifactId> + <version>3.0.0.ga</version> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>seam</artifactId> - <version>1.2.1.ga</version> + <groupId>jboss</groupId> + <artifactId>seam-core</artifactId> + <version>2.0.0.BETA</version> <systemPath>${seamHome}/jboss-seam.jar</systemPath> <scope>system</scope> </dependency> <dependency> - <groupId>org.jboss</groupId> + <groupId>jboss</groupId> <artifactId>seam-ui</artifactId> - <version>1.2.1.ga</version> + <version>2.0.0.BETA</version> <systemPath>${seamHome}/jboss-seam-ui.jar</systemPath> <scope>system</scope> </dependency> <dependency> <groupId>jboss</groupId> + <artifactId>jboss-el</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/lib/jboss-el.jar</systemPath> + <scope>system</scope> + </dependency> + <!-- + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-debug</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-debug.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-ioc</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-ioc.jar</systemPath> + <scope>system</scope> + </dependency> + --> + <dependency> + <groupId>jboss</groupId> <artifactId>javassist</artifactId> <version>3.4.ga</version> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/samples/seamIntegration/src/main/resources/logging.properties =================================================================== --- trunk/samples/seamIntegration/src/main/resources/logging.properties 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/samples/seamIntegration/src/main/resources/logging.properties 2007-07-31 23:22:14 UTC (rev 1967) @@ -5,17 +5,15 @@ # Describes specific configuration info for Handlers. ############################################################ -org.apache.juli.FileHandler.level ALL -org.apache.juli.FileHandler.directory ${catalina.base}/logs -org.apache.juli.FileHandler.prefix ajax4jsf. java.util.logging.ConsoleHandler.level ALL java.util.logging.ConsoleHandler.formatter java.util.logging.SimpleFormatter facelets.level=ALL -com.sun.faces.level=INFO +com.sun.faces.level=FINE org.apache.myfaces.level=ALL org.ajax4jsf.level=ALL +org.richfaces.level=ALL javax.enterprise.resource.webcontainer.jsf.level=INFO com.exadel.level=ALL org.jboss.seam.level=FINE Added: trunk/samples/seamIntegration/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/samples/seamIntegration/src/main/webapp/META-INF/MANIFEST.MF 2007-07-31 23:22:14 UTC (rev 1967) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Property changes on: trunk/samples/seamIntegration/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-07-31 23:22:14 UTC (rev 1967) @@ -1,20 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <components xmlns="http://jboss.com/products/seam/components" xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" xmlns:security="http://jboss.com/products/seam/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd"> + xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> - <core:init debug="true" /> + <core:init debug="false" /> + + <core:microcontainer installed="false" /> + <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" conversation-id-parameter="cid" - conversation-is-long-running-parameter="clr" /> + concurrent-request-timeout="500" conversation-id-parameter="cid" /> + + <transaction:no-transaction/> <!-- - <core:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:managed-hibernate-session name="seamDatabase" + session-factory="#{hibernateSessionFactory}" + auto-create="true"/> + + + <transaction:hibernate-transaction session="#{seamDatabase}"/> + + --> - <core:microcontainer installed="false" /> - </components> Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2007-07-31 17:25:44 UTC (rev 1966) +++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/web.xml 2007-07-31 23:22:14 UTC (rev 1967) @@ -9,7 +9,7 @@ </context-param> <context-param> <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> + <param-value>false</param-value> </context-param> <context-param> <param-name>com.sun.faces.validateXml</param-name> @@ -36,7 +36,6 @@ <param-value>false</param-value> </context-param> <!-- - --> <filter> <display-name>Ajax4jsf Filter</display-name> <filter-name>ajax4jsf</filter-name> @@ -49,21 +48,23 @@ <dispatcher>FORWARD</dispatcher> <dispatcher>INCLUDE</dispatcher> </filter-mapping> - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.web.SeamFilter</filter-class> - </filter> + --> + <!-- Seam --> - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> - <listener> - <listener-class> - org.jboss.seam.servlet.SeamListener - </listener-class> - </listener> + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> @@ -77,17 +78,6 @@ <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.jsf</url-pattern> </servlet-mapping> - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class> - org.jboss.seam.servlet.ResourceServlet - </servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> <login-config> <auth-method>BASIC</auth-method> </login-config> Added: trunk/samples/useCases/src/main/webapp/pages/replaceTD.xhtml =================================================================== --- trunk/samples/useCases/src/main/webapp/pages/replaceTD.xhtml (rev 0) +++ trunk/samples/useCases/src/main/webapp/pages/replaceTD.xhtml 2007-07-31 23:22:14 UTC (rev 1967) @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:c="http://java.sun.com/jsp/jstl/core"> + <head> + <title>Replace table cell content</title> + </head> +<body> +<f:view> + <h:form> + <h:dataTable value="#{repeatData.data}" var="row" id="r"> + <h:column id="col"> + <h:inputText value="#{row.text}"></h:inputText> + <h:outputText id="text0" value="#{row.text}"></h:outputText> + <a4j:commandButton value="Up" reRender="col"></a4j:commandButton> + </h:column> + </h:dataTable> + </h:form> + <a4j:log hotkey="M"/> +</f:view> +</body> +</html> Property changes on: trunk/samples/useCases/src/main/webapp/pages/replaceTD.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain