March 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r16660 - branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 20:23:17 -0400 (Tue, 23 Mar 2010) New Revision: 16660 Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/swfobject.js Log: https://jira.jboss.org/jira/browse/RF-8541 Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/swfobject.js =================================================================== --- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/swfobject.js 2010-03-23 23:06:53 UTC (rev 16659) +++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/swfobject.js 2010-03-24 00:23:17 UTC (rev 16660) @@ -107,11 +107,12 @@ addDomLoadEvent(main); if (ua.ie && ua.win) { try { // Avoid a possible Operation Aborted error - doc.write("<scr" + "ipt id=__ie_ondomload defer=true src=//:></scr" + "ipt>"); // String is split into pieces to avoid Norton AV to add code that can cause errors - script = getElementById("__ie_ondomload"); - if (script) { - addListener(script, "onreadystatechange", checkReadyState); - } + var head = doc.getElementsByTagName("head")[0]||document.documentElement; + script = doc.createElement("script"); + script.setAttribute("defer","defer"); + script.setAttribute("src","//:"); + head.appendChild(script); + addListener(script, "onreadystatechange", checkReadyState); } catch(e) {} } @@ -126,7 +127,7 @@ function checkReadyState() { if (script.readyState == "complete") { - script.parentNode.removeChild(script); + if(script.parentNode){script.parentNode.removeChild(script);}; callDomLoadFunctions(); } }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16659 - branches/community/3.3.X/framework/impl.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 19:06:53 -0400 (Tue, 23 Mar 2010) New Revision: 16659 Modified: branches/community/3.3.X/framework/impl/pom.xml Log: CODING IN PROGRESS - issue RF-8529: Apache Ivy cannot handle framework dependencies for 3.3.3.CR1 https://jira.jboss.org/jira/browse/RF-8529 Modified: branches/community/3.3.X/framework/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-03-23 18:43:42 UTC (rev 16658) +++ branches/community/3.3.X/framework/impl/pom.xml 2010-03-23 23:06:53 UTC (rev 16659) @@ -25,6 +25,79 @@ <artifactId>maven-install-plugin</artifactId> <version>2.3</version> </plugin> + <plugin> +  + <artifactId>maven-install-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.2</version> + <executions> + <execution> + <id>copy-resources</id> +  + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>pom.xml</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> +  + <id>overwrite-pom</id> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/pom.xml</file> + <pomFile>${project.build.directory}/pom.xml</pomFile> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <executions> + <execution> +  + <id>deploy-pom</id> + <phase>deploy</phase> + <goals> + <goal>deploy-file</goal> + </goals> + <configuration> + <url>${project.distributionManagementArtifactRepository.url}</url> + <repositoryId>${project.distributionManagementArtifactRepository.id}</repositoryId> + <file>${project.build.directory}/pom.xml</file> + <pomFile>${project.build.directory}/pom.xml</pomFile> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16658 - branches/framework-shared.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 14:43:42 -0400 (Tue, 23 Mar 2010) New Revision: 16658 Modified: branches/framework-shared/pom.xml Log: https://jira.jboss.org/jira/browse/RF-8529 Modified: branches/framework-shared/pom.xml =================================================================== --- branches/framework-shared/pom.xml 2010-03-23 18:42:52 UTC (rev 16657) +++ branches/framework-shared/pom.xml 2010-03-23 18:43:42 UTC (rev 16658) @@ -137,11 +137,11 @@ <module>impl-parent</module> --> <module>api</module> + <module>impl-shared</module> + <module>impl-jsf2</module> <module>impl</module> <module>test</module> <module>jsf-test</module> - <module>impl-shared</module> - <module>impl-jsf2</module> </modules> </project> \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16657 - branches/framework-shared/impl-jsf2/src/main/resources/META-INF.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 14:42:52 -0400 (Tue, 23 Mar 2010) New Revision: 16657 Modified: branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml Log: https://jira.jboss.org/jira/browse/RF-8529 Modified: branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml 2010-03-23 18:40:50 UTC (rev 16656) +++ branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml 2010-03-23 18:42:52 UTC (rev 16657) @@ -1,64 +1,64 @@ -<?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - version="2.0"> - <factory> - <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> - <partial-view-context-factory>org.richfaces.context.PartialViewContextFactoryImpl</partial-view-context-factory> - </factory> - <application> -  - <state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager> - </application> - <lifecycle> - <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> - <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> - </lifecycle> - <managed-bean> - <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> +<?xml version="1.0"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + <factory> + <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> + <partial-view-context-factory>org.richfaces.context.PartialViewContextFactoryImpl</partial-view-context-factory> + </factory> + <application> +  + <state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager> + </application> + <lifecycle> + <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> + </lifecycle> + <managed-bean> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> <managed-bean-name>richSkin</managed-bean-name> <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> <managed-bean-scope>application</managed-bean-scope> </managed-bean> - <managed-bean> - <managed-bean-name>ajaxContext</managed-bean-name> - <managed-bean-class>org.ajax4jsf.context.AjaxContextImpl</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> + <managed-bean> + <managed-bean-name>ajaxContext</managed-bean-name> + <managed-bean-class>org.ajax4jsf.context.AjaxContextImpl</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> </managed-bean> - <component> - - <component-type>javax.faces.ViewRoot</component-type> - <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> - - <component-extension> - <component-family>javax.faces.ViewRoot</component-family> - </component-extension> - - </component> - - <render-kit> - - <renderer> - <description> - override the viewroot - </description> - <component-family>javax.faces.ViewRoot</component-family> - <renderer-type>javax.faces.ViewRoot</renderer-type> - <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> - </renderer> - </render-kit> -</faces-config> + <component> + + <component-type>javax.faces.ViewRoot</component-type> + <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> + + <component-extension> + <component-family>javax.faces.ViewRoot</component-family> + </component-extension> + + </component> + + <render-kit> + + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16656 - in branches/framework-shared: impl/src/main and 14 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 14:40:50 -0400 (Tue, 23 Mar 2010) New Revision: 16656 Added: branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/EventValueBinding.java branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java branches/framework-shared/impl/src/main/resources/ branches/framework-shared/impl/src/main/resources/META-INF/ branches/framework-shared/impl/src/main/resources/META-INF/faces-config.xml Removed: branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/EventValueBinding.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java branches/framework-shared/impl-shared/src/main/resources/META-INF/faces-config.xml Modified: branches/framework-shared/impl-jsf2/pom.xml branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/RenderPhaseUIDataAdaptorVisitor.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/context/ContextInitParameters.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/event/InitPhaseListener.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/taglib/RowKeyConverterRule.java branches/framework-shared/impl-shared/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java branches/framework-shared/impl/pom.xml Log: https://jira.jboss.org/jira/browse/RF-8529 Modified: branches/framework-shared/impl/pom.xml =================================================================== --- branches/framework-shared/impl/pom.xml 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl/pom.xml 2010-03-23 18:40:50 UTC (rev 16656) @@ -28,6 +28,7 @@ <goal>shade</goal> </goals> <configuration> + <createSourcesJar>true</createSourcesJar> <artifactSet> <includes> <include>org.richfaces.framework:richfaces-impl-shared</include> @@ -70,7 +71,17 @@ <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-shared</artifactId> <version>3.3.3-SNAPSHOT</version> - <optional>true</optional> </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> </project> \ No newline at end of file Copied: branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java (from rev 16654, branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/EventValueBinding.java) =================================================================== --- branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java (rev 0) +++ branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,75 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.component; + +import org.richfaces.webapp.taglib.ValueBindingValueExpressionAdaptor; + + +/** + * Inner class for build event string for parent component. + * + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:38 $ Disadvantages - + * not rebuild event string setted as EL expression. TODO - save + * expressions for build event string at render phase. + */ +public class EventValueBinding extends ValueBindingValueExpressionAdaptor { + + /** + * + */ + private static final long serialVersionUID = -6583167387542332290L; + + /** + * Default constructor for restoreState. + */ + public EventValueBinding() { + super(new EventValueExpression()); + } + + /** + * Constructor for build from AjaxComponent. + * + * @param update + */ + public EventValueBinding(AjaxSupport update) { + super(new EventValueExpression(update)); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.StateHolder#isTransient() + */ + public boolean isTransient() { + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.StateHolder#setTransient(boolean) + */ + public void setTransient(boolean newTransientValue) { + } + +} \ No newline at end of file Copied: branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java (from rev 16654, branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java) =================================================================== --- branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java (rev 0) +++ branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,100 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.ajax4jsf.component; + +import java.sql.ResultSet; +import java.util.Collections; +import java.util.List; + +import javax.faces.model.ArrayDataModel; +import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; +import javax.faces.model.ResultDataModel; +import javax.faces.model.ResultSetDataModel; +import javax.faces.model.ScalarDataModel; +import javax.servlet.jsp.jstl.sql.Result; + +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; +import org.ajax4jsf.model.SequenceRange; + +/** + * @author asmirnov + * + */ +public abstract class SequenceDataAdaptor extends UIDataAdaptor { + + protected DataComponentState createComponentState() { + // Create component state based on this instance. + return new DataComponentState(){ + + public Range getRange() { + return new SequenceRange(getFirst(),getRows()); + } + }; + + } + + protected ExtendedDataModel createDataModel() { + return (ExtendedDataModel) getDataModel(); + } + + protected DataModel getDataModel() { + // Synthesize a DataModel around our current value if possible + // TODO - for jsf 1.2 use method from superclass ? + Object current = getValue(); + DataModel model; + if (current == null) { + model = new SequenceDataModel(new ListDataModel(Collections.EMPTY_LIST)); + } else if (current instanceof ExtendedDataModel) { + model = (DataModel) current; + } else if (current instanceof DataModel) { + model = new SequenceDataModel((DataModel) current); + } else if (current instanceof List) { + model = new SequenceDataModel(new ListDataModel((List<?>) current)); + } else if (Object[].class.isAssignableFrom(current.getClass())) { + model = new SequenceDataModel(new ArrayDataModel((Object[]) current)); + } else if (current instanceof ResultSet) { + model = new SequenceDataModel(new ResultSetDataModel((ResultSet) current)); + } else if (current instanceof Result) { + model = new SequenceDataModel(new ResultDataModel((Result) current)); + } else { + model = new SequenceDataModel(new ScalarDataModel(current)); + } + return (model); + } + + protected void setDataModel(DataModel model) { + ExtendedDataModel iterableModel; + if( null == model){ + iterableModel = null; + } else if (model instanceof ExtendedDataModel) { + iterableModel = (ExtendedDataModel) model; + } else { + iterableModel = new SequenceDataModel(model); + } + setExtendedDataModel(iterableModel); + } + + +} Property changes on: branches/framework-shared/impl/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/framework-shared/impl/src/main/resources/META-INF/faces-config.xml (from rev 16654, branches/framework-shared/impl-shared/src/main/resources/META-INF/faces-config.xml) =================================================================== --- branches/framework-shared/impl/src/main/resources/META-INF/faces-config.xml (rev 0) +++ branches/framework-shared/impl/src/main/resources/META-INF/faces-config.xml 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,78 @@ +<?xml version="1.0"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> + <factory> + <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> +  + </factory> + <application> +  + <state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager> + </application> + <lifecycle> + <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> + </lifecycle> + <managed-bean> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>richSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>ajaxContext</managed-bean-name> + <managed-bean-class>org.ajax4jsf.context.AjaxContextImpl</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <component> + + <component-type>javax.faces.ViewRoot</component-type> + <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> + + <component-extension> + <component-family>javax.faces.ViewRoot</component-family> + </component-extension> + + </component> + + <render-kit> + + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> + </renderer> +  + </render-kit> +</faces-config> Modified: branches/framework-shared/impl-jsf2/pom.xml =================================================================== --- branches/framework-shared/impl-jsf2/pom.xml 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-jsf2/pom.xml 2010-03-23 18:40:50 UTC (rev 16656) @@ -1,23 +1,90 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>framework</artifactId> - <groupId>org.richfaces</groupId> - <version>3.3.3-SNAPSHOT</version> - </parent> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl-jsf2</artifactId> - <version>3.3.3-SNAPSHOT</version> - <name>impl-jsf2</name> - <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> +<project + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-jsf2</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>impl-jsf2</name> + <url>http://maven.apache.org</url> + <build> + <plugins> + <plugin> +  + <artifactId>maven-install-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createSourcesJar>true</createSourcesJar> + <artifactSet> + <includes> + <include>org.richfaces.framework:richfaces-impl-shared</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <includesAllSourceRoots>false</includesAllSourceRoots> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-shared</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </project> Added: branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/EventValueBinding.java =================================================================== --- branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/EventValueBinding.java (rev 0) +++ branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,75 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.component; + +import org.richfaces.webapp.taglib.ValueBindingValueExpressionAdaptor; + + +/** + * Inner class for build event string for parent component. + * + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:38 $ Disadvantages - + * not rebuild event string setted as EL expression. TODO - save + * expressions for build event string at render phase. + */ +public class EventValueBinding extends ValueBindingValueExpressionAdaptor { + + /** + * + */ + private static final long serialVersionUID = -6583167387542332290L; + + /** + * Default constructor for restoreState. + */ + public EventValueBinding() { + super(new EventValueExpression()); + } + + /** + * Constructor for build from AjaxComponent. + * + * @param update + */ + public EventValueBinding(AjaxSupport update) { + super(new EventValueExpression(update)); + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.StateHolder#isTransient() + */ + public boolean isTransient() { + return false; + } + + /* + * (non-Javadoc) + * + * @see javax.faces.component.StateHolder#setTransient(boolean) + */ + public void setTransient(boolean newTransientValue) { + } + +} \ No newline at end of file Property changes on: branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/EventValueBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java =================================================================== --- branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java (rev 0) +++ branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,100 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.ajax4jsf.component; + +import java.sql.ResultSet; +import java.util.Collections; +import java.util.List; + +import javax.faces.model.ArrayDataModel; +import javax.faces.model.DataModel; +import javax.faces.model.ListDataModel; +import javax.faces.model.ResultDataModel; +import javax.faces.model.ResultSetDataModel; +import javax.faces.model.ScalarDataModel; +import javax.servlet.jsp.jstl.sql.Result; + +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceDataModel; +import org.ajax4jsf.model.SequenceRange; + +/** + * @author asmirnov + * + */ +public abstract class SequenceDataAdaptor extends UIDataAdaptor { + + protected DataComponentState createComponentState() { + // Create component state based on this instance. + return new DataComponentState(){ + + public Range getRange() { + return new SequenceRange(getFirst(),getRows()); + } + }; + + } + + protected ExtendedDataModel createDataModel() { + return (ExtendedDataModel) getDataModel(); + } + + protected DataModel getDataModel() { + // Synthesize a DataModel around our current value if possible + // TODO - for jsf 1.2 use method from superclass ? + Object current = getValue(); + DataModel model; + if (current == null) { + model = new SequenceDataModel(new ListDataModel(Collections.EMPTY_LIST)); + } else if (current instanceof ExtendedDataModel) { + model = (DataModel) current; + } else if (current instanceof DataModel) { + model = new SequenceDataModel((DataModel) current); + } else if (current instanceof List) { + model = new SequenceDataModel(new ListDataModel((List<?>) current)); + } else if (Object[].class.isAssignableFrom(current.getClass())) { + model = new SequenceDataModel(new ArrayDataModel((Object[]) current)); + } else if (current instanceof ResultSet) { + model = new SequenceDataModel(new ResultSetDataModel((ResultSet) current)); + } else if (current instanceof Result) { + model = new SequenceDataModel(new ResultDataModel((Result) current)); + } else { + model = new SequenceDataModel(new ScalarDataModel(current)); + } + return (model); + } + + protected void setDataModel(DataModel model) { + ExtendedDataModel iterableModel; + if( null == model){ + iterableModel = null; + } else if (model instanceof ExtendedDataModel) { + iterableModel = (ExtendedDataModel) model; + } else { + iterableModel = new SequenceDataModel(model); + } + setExtendedDataModel(iterableModel); + } + + +} Property changes on: branches/framework-shared/impl-jsf2/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml (rev 0) +++ branches/framework-shared/impl-jsf2/src/main/resources/META-INF/faces-config.xml 2010-03-23 18:40:50 UTC (rev 16656) @@ -0,0 +1,64 @@ +<?xml version="1.0"?> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + <factory> + <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> + <partial-view-context-factory>org.richfaces.context.PartialViewContextFactoryImpl</partial-view-context-factory> + </factory> + <application> +  + <state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager> + </application> + <lifecycle> + <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> + <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> + </lifecycle> + <managed-bean> + <managed-bean-name>a4j</managed-bean-name> + <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>a4jSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>richSkin</managed-bean-name> + <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>ajaxContext</managed-bean-name> + <managed-bean-class>org.ajax4jsf.context.AjaxContextImpl</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <component> + + <component-type>javax.faces.ViewRoot</component-type> + <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> + + <component-extension> + <component-family>javax.faces.ViewRoot</component-family> + </component-extension> + + </component> + + <render-kit> + + <renderer> + <description> + override the viewroot + </description> + <component-family>javax.faces.ViewRoot</component-family> + <renderer-type>javax.faces.ViewRoot</renderer-type> + <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> Deleted: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/EventValueBinding.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/EventValueBinding.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -1,75 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.component; - -import org.richfaces.webapp.taglib.ValueBindingValueExpressionAdaptor; - - -/** - * Inner class for build event string for parent component. - * - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:57:38 $ Disadvantages - - * not rebuild event string setted as EL expression. TODO - save - * expressions for build event string at render phase. - */ -public class EventValueBinding extends ValueBindingValueExpressionAdaptor { - - /** - * - */ - private static final long serialVersionUID = -6583167387542332290L; - - /** - * Default constructor for restoreState. - */ - public EventValueBinding() { - super(new EventValueExpression()); - } - - /** - * Constructor for build from AjaxComponent. - * - * @param update - */ - public EventValueBinding(AjaxSupport update) { - super(new EventValueExpression(update)); - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.StateHolder#isTransient() - */ - public boolean isTransient() { - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.faces.component.StateHolder#setTransient(boolean) - */ - public void setTransient(boolean newTransientValue) { - } - -} \ No newline at end of file Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/RenderPhaseUIDataAdaptorVisitor.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/RenderPhaseUIDataAdaptorVisitor.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/RenderPhaseUIDataAdaptorVisitor.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -40,8 +40,8 @@ */ public void beforeComponent(UIComponent component, PhaseEvent event, Object state) { - if (component instanceof UIDataAdaptor) { - ((UIDataAdaptor) component).beforeRenderResponse(event.getFacesContext()); + if (component instanceof UIDataAdaptorBase) { + ((UIDataAdaptorBase) component).beforeRenderResponse(event.getFacesContext()); } } Deleted: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/SequenceDataAdaptor.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -1,100 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.ajax4jsf.component; - -import java.sql.ResultSet; -import java.util.Collections; -import java.util.List; - -import javax.faces.model.ArrayDataModel; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; -import javax.faces.model.ResultDataModel; -import javax.faces.model.ResultSetDataModel; -import javax.faces.model.ScalarDataModel; -import javax.servlet.jsp.jstl.sql.Result; - -import org.ajax4jsf.model.DataComponentState; -import org.ajax4jsf.model.ExtendedDataModel; -import org.ajax4jsf.model.Range; -import org.ajax4jsf.model.SequenceDataModel; -import org.ajax4jsf.model.SequenceRange; - -/** - * @author asmirnov - * - */ -public abstract class SequenceDataAdaptor extends UIDataAdaptor { - - protected DataComponentState createComponentState() { - // Create component state based on this instance. - return new DataComponentState(){ - - public Range getRange() { - return new SequenceRange(getFirst(),getRows()); - } - }; - - } - - protected ExtendedDataModel createDataModel() { - return (ExtendedDataModel) getDataModel(); - } - - protected DataModel getDataModel() { - // Synthesize a DataModel around our current value if possible - // TODO - for jsf 1.2 use method from superclass ? - Object current = getValue(); - DataModel model; - if (current == null) { - model = new SequenceDataModel(new ListDataModel(Collections.EMPTY_LIST)); - } else if (current instanceof ExtendedDataModel) { - model = (DataModel) current; - } else if (current instanceof DataModel) { - model = new SequenceDataModel((DataModel) current); - } else if (current instanceof List) { - model = new SequenceDataModel(new ListDataModel((List<?>) current)); - } else if (Object[].class.isAssignableFrom(current.getClass())) { - model = new SequenceDataModel(new ArrayDataModel((Object[]) current)); - } else if (current instanceof ResultSet) { - model = new SequenceDataModel(new ResultSetDataModel((ResultSet) current)); - } else if (current instanceof Result) { - model = new SequenceDataModel(new ResultDataModel((Result) current)); - } else { - model = new SequenceDataModel(new ScalarDataModel(current)); - } - return (model); - } - - protected void setDataModel(DataModel model) { - ExtendedDataModel iterableModel; - if( null == model){ - iterableModel = null; - } else if (model instanceof ExtendedDataModel) { - iterableModel = (ExtendedDataModel) model; - } else { - iterableModel = new SequenceDataModel(model); - } - setExtendedDataModel(iterableModel); - } - - -} Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -504,7 +504,7 @@ private static final AjaxChildrenRenderer _childrenRenderer = new AjaxChildrenRenderer() { protected Class<? extends UIComponent> getComponentClass() { - return UIDataAdaptor.class; + return UIDataAdaptorBase.class; } }; @@ -653,7 +653,7 @@ DataComponentState state = null; if (this._currentState == null) { // Check for binding state to user bean. - ValueExpression valueBinding = getValueExpression(UIDataAdaptor.COMPONENT_STATE_ATTRIBUTE); + ValueExpression valueBinding = getValueExpression(UIDataAdaptorBase.COMPONENT_STATE_ATTRIBUTE); FacesContext facesContext = getFacesContext(); ELContext elContext = facesContext.getELContext(); if (null != valueBinding) { Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -25,7 +25,6 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import org.ajax4jsf.application.AjaxStateManager; /** * This class hold all methods for get application init parameters. Created for @@ -75,6 +74,8 @@ public static final String HANDLE_VIEW_EXPIRED_ON_CLIENT="org.ajax4jsf.handleViewExpiredOnClient"; public static final String[] DATATABLE_USES_VIEW_LOCALE = {"org.richfaces.datatableUsesViewLocale"}; + + public static final int DEFAULT_NUMBER_OF_VIEWS = 16; public static final boolean isSerializeServerState(FacesContext context) { return getBoolean(context, SERIALIZE_SERVER_STATE, false); @@ -96,7 +97,7 @@ */ public static int getNumbersOfViewsInSession(FacesContext context) { return getInteger(context, NUMBER_OF_VIEWS_IN_SESSION, - AjaxStateManager.DEFAULT_NUMBER_OF_VIEWS); + DEFAULT_NUMBER_OF_VIEWS); } /** @@ -106,7 +107,7 @@ */ public static int getNumbersOfLogicalViews(FacesContext context) { return getInteger(context, NUMBER_OF_LOGICAL_VIEWS_IN_SESSION, - AjaxStateManager.DEFAULT_NUMBER_OF_VIEWS); + DEFAULT_NUMBER_OF_VIEWS); } /** Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/event/InitPhaseListener.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -34,7 +34,6 @@ import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; -import org.ajax4jsf.application.AjaxStateManager; import org.ajax4jsf.application.AjaxViewHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -44,7 +44,6 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.application.AjaxViewHandler; import org.ajax4jsf.component.AjaxRegionBrige; -import org.ajax4jsf.component.UIDataAdaptor; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.ContextInitParameters; import org.ajax4jsf.renderkit.AjaxContainerRenderer; Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/taglib/RowKeyConverterRule.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/taglib/RowKeyConverterRule.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/webapp/taglib/RowKeyConverterRule.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -22,7 +22,7 @@ import javax.faces.convert.Converter; -import org.ajax4jsf.component.UIDataAdaptor; +import org.ajax4jsf.component.UIDataAdaptorBase; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.MetaRule; @@ -48,7 +48,7 @@ @Override public void applyMetadata(FaceletContext ctx, Object instance) { - ((UIDataAdaptor) instance).setValueExpression("rowKeyConverter", + ((UIDataAdaptorBase) instance).setValueExpression("rowKeyConverter", attribute.getValueExpression(ctx, Converter.class)); } @@ -67,7 +67,7 @@ public void applyMetadata(FaceletContext ctx, Object instance) { Converter converter = ctx.getFacesContext().getApplication() .createConverter(converterId); - ((UIDataAdaptor) instance).setRowKeyConverter(converter); + ((UIDataAdaptorBase) instance).setRowKeyConverter(converter); } } @@ -86,7 +86,7 @@ public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { - if (meta.isTargetInstanceOf(UIDataAdaptor.class)) { + if (meta.isTargetInstanceOf(UIDataAdaptorBase.class)) { if ("rowKeyConverter".equals(name)) { if (attribute.isLiteral()) { return new StaticConverterMetadata(attribute.getValue()); Modified: branches/framework-shared/impl-shared/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java =================================================================== --- branches/framework-shared/impl-shared/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2010-03-23 18:40:50 UTC (rev 16656) @@ -34,7 +34,7 @@ import javax.faces.webapp.UIComponentELTag; import org.ajax4jsf.Messages; -import org.ajax4jsf.component.UIDataAdaptor; +import org.ajax4jsf.component.UIDataAdaptorBase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -86,8 +86,8 @@ protected void setRowKeyConverterProperty(UIComponent component, ValueExpression converter) { if (converter != null) { - if (component instanceof UIDataAdaptor) { - UIDataAdaptor data = (UIDataAdaptor) component; + if (component instanceof UIDataAdaptorBase) { + UIDataAdaptorBase data = (UIDataAdaptorBase) component; if (!converter.isLiteralText()) { component.setValueExpression("rowKeyConverter", converter); } else { Deleted: branches/framework-shared/impl-shared/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/framework-shared/impl-shared/src/main/resources/META-INF/faces-config.xml 2010-03-23 16:16:55 UTC (rev 16655) +++ branches/framework-shared/impl-shared/src/main/resources/META-INF/faces-config.xml 2010-03-23 18:40:50 UTC (rev 16656) @@ -1,78 +0,0 @@ -<?xml version="1.0"?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" - version="1.2"> - <factory> - <render-kit-factory>org.ajax4jsf.renderkit.ChameleonRenderKitFactory</render-kit-factory> -  - </factory> - <application> -  - <state-manager>org.ajax4jsf.application.AjaxStateManager</state-manager> - </application> - <lifecycle> - <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> - <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> - </lifecycle> - <managed-bean> - <managed-bean-name>a4j</managed-bean-name> - <managed-bean-class>org.richfaces.VersionBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>a4jSkin</managed-bean-name> - <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>richSkin</managed-bean-name> - <managed-bean-class>org.richfaces.skin.SkinBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>ajaxContext</managed-bean-name> - <managed-bean-class>org.ajax4jsf.context.AjaxContextImpl</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <component> - - <component-type>javax.faces.ViewRoot</component-type> - <component-class>org.ajax4jsf.component.AjaxViewRoot</component-class> - - <component-extension> - <component-family>javax.faces.ViewRoot</component-family> - </component-extension> - - </component> - - <render-kit> - - <renderer> - <description> - override the viewroot - </description> - <component-family>javax.faces.ViewRoot</component-family> - <renderer-type>javax.faces.ViewRoot</renderer-type> - <renderer-class>org.ajax4jsf.renderkit.AjaxViewRootRenderer</renderer-class> - </renderer> -  - </render-kit> -</faces-config>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16655 - branches/framework-shared/impl/src/main.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-23 12:16:55 -0400 (Tue, 23 Mar 2010) New Revision: 16655 Added: branches/framework-shared/impl/src/main/java/ Removed: branches/framework-shared/impl/src/main/java-jsf12/ branches/framework-shared/impl/src/main/java-jsf20/ Log: Copied: branches/framework-shared/impl/src/main/java (from rev 16654, branches/framework-shared/impl/src/main/java-jsf12)

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16654 - in branches: framework-shared and 18 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-03-22 20:26:05 -0400 (Mon, 22 Mar 2010) New Revision: 16654 Added: branches/framework-shared/ branches/framework-shared/impl-jsf2/ branches/framework-shared/impl-jsf2/pom.xml branches/framework-shared/impl-jsf2/src/ branches/framework-shared/impl-jsf2/src/main/ branches/framework-shared/impl-jsf2/src/main/java/ branches/framework-shared/impl-jsf2/src/main/java/org/ branches/framework-shared/impl-jsf2/src/main/resources/ branches/framework-shared/impl-jsf2/src/test/ branches/framework-shared/impl-jsf2/src/test/java/ branches/framework-shared/impl-jsf2/src/test/java/org/ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java branches/framework-shared/impl-shared/ branches/framework-shared/impl-shared/build.xml branches/framework-shared/impl-shared/generatescript.xml branches/framework-shared/impl-shared/pom.xml branches/framework-shared/impl-shared/src/ branches/framework-shared/impl-shared/src/main/ branches/framework-shared/impl-shared/src/main/java/ branches/framework-shared/impl-shared/src/main/java/META-INF/ branches/framework-shared/impl-shared/src/main/java/org/ branches/framework-shared/impl-shared/src/main/javacc/ branches/framework-shared/impl-shared/src/main/javascript/ branches/framework-shared/impl-shared/src/main/resources/ branches/framework-shared/impl-shared/src/test/ branches/framework-shared/impl-shared/src/test/java/ branches/framework-shared/impl-shared/src/test/resources/ Removed: branches/framework-shared/impl/build.xml branches/framework-shared/impl/generatescript.xml branches/framework-shared/impl/src/main/java-jsf20/org/ branches/framework-shared/impl/src/main/java/ branches/framework-shared/impl/src/main/javacc/ branches/framework-shared/impl/src/main/javascript/ branches/framework-shared/impl/src/main/resources-jsf20/ branches/framework-shared/impl/src/main/resources/ branches/framework-shared/impl/src/test/java/ branches/framework-shared/impl/src/test/resources/ Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java branches/framework-shared/impl/pom.xml branches/framework-shared/pom.xml Log: create shared project Copied: branches/framework-shared (from rev 16649, branches/community/3.3.X/framework) Deleted: branches/framework-shared/impl/build.xml =================================================================== --- branches/community/3.3.X/framework/impl/build.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/build.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<project basedir="." default="build" name="common"> - <property environment="env"/> - <property file="build.properties" /> -  - <property name="M2_REPO" value="C:/Documents and Settings/Administrator/.m2/repository"/> - <property name="CLOVER" value="${M2_REPO}/com/cenqua/clover/clover/1.3.13/clover-1.3.13.jar" /> - - <taskdef resource="com/cenqua/ant/antlib.xml" classpath="cenquatasks.jar"/> - <extendclasspath path="${CLOVER}" /> - <taskdef resource="clovertasks" classpath="${CLOVER}" /> - - <path id="common.classpath"> - <pathelement location="${CLOVER}"/> - <pathelement location="target/classes"/> - <pathelement location="target/test-classes"/> - <pathelement location="${M2_REPO}/opensymphony/oscache/2.3/oscache-2.3.jar"/> - <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-api/3.1.0-SNAPSHOT/richfaces-api-3.1.0-SNAPSHOT.jar"/> - <pathelement location="${M2_REPO}/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> - <pathelement location="${M2_REPO}/jaxen/jaxen/1.1-beta-11/jaxen-1.1-beta-11.jar"/> - <pathelement location="${M2_REPO}/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> - <pathelement location="${M2_REPO}/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> - <pathelement location="${M2_REPO}/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/> - <pathelement location="${M2_REPO}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> - <pathelement location="${M2_REPO}/jdom/jdom/1.0/jdom-1.0.jar"/> - <pathelement location="${M2_REPO}/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/> - <pathelement location="${M2_REPO}/javax/el/el-api/1.0/el-api-1.0.jar"/> - <pathelement location="${M2_REPO}/commons-io/commons-io/1.2/commons-io-1.2.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <pathelement location="${M2_REPO}/el-impl/el-impl/1.0/el-impl-1.0.jar"/> - <pathelement location="${M2_REPO}/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> - <pathelement location="${M2_REPO}/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> - <pathelement location="${M2_REPO}/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> - <pathelement location="${M2_REPO}/com/sun/facelets/jsf-facelets/1.1.11/jsf-facelets-1.1.11.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/jstl/1.0/jstl-1.0.jar"/> - <pathelement location="${M2_REPO}/xom/xom/1.0b3/xom-1.0b3.jar"/> - <pathelement location="${M2_REPO}/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/> - <pathelement location="${M2_REPO}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> - <pathelement location="${M2_REPO}/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> - <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-impl/3.1.0-SNAPSHOT/richfaces-impl-3.1.0-SNAPSHOT.jar"/> - <pathelement location="${M2_REPO}/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/> - <pathelement location="${M2_REPO}/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/> - <pathelement location="${M2_REPO}/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/> - <pathelement location="${M2_REPO}/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/> - <pathelement location="${M2_REPO}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> - <pathelement location="${M2_REPO}/junit/junit/3.8.1/junit-3.8.1.jar"/> - <pathelement location="${M2_REPO}/commons-collections/commons-collections/3.0/commons-collections-3.0.jar"/> - <pathelement location="${M2_REPO}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> - <pathelement location="${M2_REPO}/rhino/js/1.6R2/js-1.6R2.jar"/> - <pathelement location="${M2_REPO}/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/> - <pathelement location="${M2_REPO}/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> - - - </path> - <target name="init" depends="clean"> - <mkdir dir="target/clover/classes"/> - <clover-clean initstring="target/clover/clover.db" keepdb="false"/> - <clover-setup initstring="target/clover/clover.db" flushpolicy="interval" flushinterval="1000"> - <fileset dir="src" includes="**/*.java"/> - </clover-setup> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="target/classes" excludes="**/*.launch, **/*.java, **/*.class"/> - </copy> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="src" excludes="**/*.launch, **/*.java"/> - </copy> - <copy includeemptydirs="false" todir="target/clover/classes"> - <fileset dir="src" excludes="**/*.launch, **/*.java"/> - </copy> - </target> - <target name="clean"> - <delete dir="target/clover/classes"/> - <delete file="target/clover/richfaces-clovered-impl.jar"/> - </target> - <target depends="clean" name="cleanall"/> - <target depends="build-project" name="build"/> - <target depends="init" name="build-project"> - <echo message="${ant.project.name}: ${ant.file}"/> - - <javac source="1.4" srcdir="src" classpathref="common.classpath" debug="true" debuglevel="source,lines,vars" destdir="target/clover/classes" /> - - <jar destfile="target/clover/richfaces-clovered-impl.jar"> - <fileset dir="target/clover/classes" /> - </jar> - </target> -</project> Deleted: branches/framework-shared/impl/generatescript.xml =================================================================== --- branches/community/3.3.X/framework/impl/generatescript.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/generatescript.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,157 +0,0 @@ -<?xml version="1.0"?> - -<project name="assemblescripts" default="assembly"> - <description> - Assemble all javaScript library files to one AJAXJSF.js - </description> - - <property name="scripts-path" value="org/ajax4jsf/javascript/scripts"></property> - <property name="prototype-scripts-path" value="org/ajax4jsf/javascript/scripts"></property> - <property name="scriptaculous-scripts-path" value="org/richfaces/renderkit/html/scripts/scriptaculous"></property> - <property name="jquery-scripts-path" value="org/richfaces/renderkit/html/scripts/jquery"></property> - - <property name="target-dir" value="${project.build.directory}/javascript"></property> - - <property name="scripts.dir" - value="${target-dir}/${scripts-path}" - /> - <property name="prototype.scripts.dir" - value="${target-dir}/${prototype-scripts-path}" - /> - <property name="script" value="AJAX.js" /> - - <property name="script.rico" value="rico.js"></property> - <property name="script.aculo" value="scriptaculo.js"></property> - <property name="script.scriptaculous" value="scriptaculous.js"></property> - <property name="scriptaculous.scripts.dir" - value="${target-dir}/${scriptaculous-scripts-path}"/> - <property name="jquery.scripts.dir" - value="${target-dir}/${jquery-scripts-path}"/> - - <property name="script.prototype" value="prototype.js"></property> - <property name="script.jquery" value="jquery.js"></property> - - <property name="script.imagecache" value="imagecache.js"></property> - <property name="script.dnd" value="dnd.js"></property> - <property name="script.css-rules" value="css-rules.js"></property> - <filelist id="imagecache" dir="${basedir}/src/main/javascript/ajaxjsf" files="imagecache.js"></filelist> - - <filelist id="jquery" - dir="${basedir}/src/main/javascript/jquery" - files="jquery-1.3.2.js,../memory.js,patches.js"> - </filelist> - - <filelist id="scriptaculous" - dir="${basedir}/src/main/javascript/scriptaculous" - files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js" > - </filelist> - - - <filelist id="prototype" - dir="${basedir}/src/main/javascript/prototype" - files="prototype-1.6.0.3.js,../memory.js,patches.js"> - </filelist> - - - <filelist id="dnd" - dir="${basedir}/src/main/javascript/dnd" - files="prolog.js,dnd.js,epilog.js"> - </filelist> - - <filelist id="ajaxjsf" dir="${basedir}/src/main/javascript/ajaxjsf" files="prolog.js,sarissa.js,JSFAJAX.js,queue.js,log4ajax.js,epilog.js,../memory.js"></filelist> -  - <target name="assembly" - depends="depends" - description="--> Assemble all javaScript library files to one AJAXJSF.js" - > - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script}" - fixlastline="yes" - eol="unix" - > - <filelist refid="ajaxjsf"> - </filelist> - </concat> - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script.imagecache}" - fixlastline="yes" - eol="unix" - > - <filelist refid="imagecache"/> - </concat> - <concat append="false" - binary="false" - destfile="${scripts.dir}/${script.dnd}" - fixlastline="yes" - eol="unix" - > - <filelist refid="dnd"/> - </concat> - <concat append="false" - binary="false" - destfile="${prototype.scripts.dir}/${script.prototype}" - fixlastline="yes" - eol="unix"> - <filelist refid="prototype"> - </filelist> - </concat> - <concat append="false" - binary="false" - destfile="${scriptaculous.scripts.dir}/${script.scriptaculous}" - fixlastline="yes" - eol="unix" - > - <filelist refid="scriptaculous"></filelist> - </concat> - - <concat append="false" - binary="false" - destfile="${jquery.scripts.dir}/${script.jquery}" - fixlastline="yes" - eol="unix" - > - <filelist refid="jquery"></filelist> - </concat> - - - <copy todir="${prototype.scripts.dir}" file="${basedir}/src/main/javascript/ajaxjsf/smartposition.js"> - </copy> - <copy todir="${scriptaculous.scripts.dir}"> - <fileset dir="${basedir}/src/main/javascript/scriptaculous"></fileset> - </copy> - </target> - - -  - <target name="fixeol" depends="depends" description="--> Fix CR/LF in files"> - <fixcrlf srcdir="${basedir}" includes="*.js" eol="unix"> - </fixcrlf> - </target> - - -  - <target name="depends"> - </target> - -</project> - Modified: branches/framework-shared/impl/pom.xml =================================================================== --- branches/community/3.3.X/framework/impl/pom.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -7,139 +7,36 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.framework</groupId> - <artifactId>${classifiedArtifactId}</artifactId> + <artifactId>richfaces-impl</artifactId> <name>Java Server Faces AJAX framework implementation</name> <version>3.3.3-SNAPSHOT</version> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> <plugins> <plugin>  <artifactId>maven-install-plugin</artifactId> <version>2.3</version> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${frameworkAdditionalSourceFolder}</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <goals> - <goal>javacc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>javascript</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" value="${project.build.directory}/javascript" /> - </ant> - </tasks> - <resourceRoot>${project.build.directory}/javascript</resourceRoot> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-javascript-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <goals> - <goal>compress</goal> - </goals> - <configuration> - <nosuffix>false</nosuffix> - <outputDirectory>${project.build.directory}/compressed/</outputDirectory> - <aggregations> - <aggregation> - <insertNewLine>true</insertNewLine> - <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> - <includes> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> - <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> - <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> - <include>**/*-min.js</include> - </includes> - <excludes> - <exclude>**/*.pack.js</exclude> - <exclude>**/scriptaculous/*.js</exclude> - <exclude>**/extend-min.js</exclude> - <exclude>**/jquery.jcarousel-min.js</exclude> - <exclude>**/compressed.css</exclude> - </excludes> - </aggregation> - </aggregations> - <resources> - <resource> - <directory>target/javascript</directory> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>jslint</id> - <phase>test</phase> - <goals> - <goal>jslint</goal> - </goals> - <configuration> - <includes> - <include>**/framework.pack.js</include> - </includes> - <resources> - <resource> - <directory>${project.build.outputDirectory}</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>org.richfaces.framework:richfaces-impl-shared</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -157,99 +54,23 @@ </plugins> </build> </profile> - <profile> - <id>jsf2_0</id> - <build> - <plugins> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources-jsf20</directory> - </resource> - </resources> - </build> - <dependencies> + </profiles> + <dependencies> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <frameworkAdditionalSourceFolder>src/main/java-jsf20</frameworkAdditionalSourceFolder> - <classifiedArtifactId>richfaces-impl-jsf2</classifiedArtifactId> - </properties> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> - </dependencies> - <properties> - <frameworkAdditionalSourceFolder>src/main/java-jsf12</frameworkAdditionalSourceFolder> - <classifiedArtifactId>richfaces-impl</classifiedArtifactId> - </properties> - </profile> - </profiles> - <dependencies> <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - <optional>true</optional> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> </dependency> <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.6</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8.1</version> - <exclusions> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> + <artifactId>richfaces-impl-shared</artifactId> <version>3.3.3-SNAPSHOT</version> + <optional>true</optional> </dependency> </dependencies> </project> \ No newline at end of file Added: branches/framework-shared/impl-jsf2/pom.xml =================================================================== --- branches/framework-shared/impl-jsf2/pom.xml (rev 0) +++ branches/framework-shared/impl-jsf2/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-jsf2</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>impl-jsf2</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Copied: branches/framework-shared/impl-jsf2/src/main/java/org (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java-jsf20/org) Copied: branches/framework-shared/impl-jsf2/src/main/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/main/resources-jsf20) Added: branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java =================================================================== --- branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java (rev 0) +++ branches/framework-shared/impl-jsf2/src/test/java/org/richfaces/AppTest.java 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,38 @@ +package org.richfaces; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} Copied: branches/framework-shared/impl-shared/build.xml (from rev 16649, branches/community/3.3.X/framework/impl/build.xml) =================================================================== --- branches/framework-shared/impl-shared/build.xml (rev 0) +++ branches/framework-shared/impl-shared/build.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<project basedir="." default="build" name="common"> + <property environment="env"/> + <property file="build.properties" /> +  + <property name="M2_REPO" value="C:/Documents and Settings/Administrator/.m2/repository"/> + <property name="CLOVER" value="${M2_REPO}/com/cenqua/clover/clover/1.3.13/clover-1.3.13.jar" /> + + <taskdef resource="com/cenqua/ant/antlib.xml" classpath="cenquatasks.jar"/> + <extendclasspath path="${CLOVER}" /> + <taskdef resource="clovertasks" classpath="${CLOVER}" /> + + <path id="common.classpath"> + <pathelement location="${CLOVER}"/> + <pathelement location="target/classes"/> + <pathelement location="target/test-classes"/> + <pathelement location="${M2_REPO}/opensymphony/oscache/2.3/oscache-2.3.jar"/> + <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-api/3.1.0-SNAPSHOT/richfaces-api-3.1.0-SNAPSHOT.jar"/> + <pathelement location="${M2_REPO}/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> + <pathelement location="${M2_REPO}/jaxen/jaxen/1.1-beta-11/jaxen-1.1-beta-11.jar"/> + <pathelement location="${M2_REPO}/org/ccil/cowan/tagsoup/tagsoup/0.9.7/tagsoup-0.9.7.jar"/> + <pathelement location="${M2_REPO}/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> + <pathelement location="${M2_REPO}/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.jar"/> + <pathelement location="${M2_REPO}/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/> + <pathelement location="${M2_REPO}/jdom/jdom/1.0/jdom-1.0.jar"/> + <pathelement location="${M2_REPO}/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"/> + <pathelement location="${M2_REPO}/javax/el/el-api/1.0/el-api-1.0.jar"/> + <pathelement location="${M2_REPO}/commons-io/commons-io/1.2/commons-io-1.2.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> + <pathelement location="${M2_REPO}/el-impl/el-impl/1.0/el-impl-1.0.jar"/> + <pathelement location="${M2_REPO}/xalan/xalan/2.6.0/xalan-2.6.0.jar"/> + <pathelement location="${M2_REPO}/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/> + <pathelement location="${M2_REPO}/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/> + <pathelement location="${M2_REPO}/com/sun/facelets/jsf-facelets/1.1.11/jsf-facelets-1.1.11.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/jstl/1.0/jstl-1.0.jar"/> + <pathelement location="${M2_REPO}/xom/xom/1.0b3/xom-1.0b3.jar"/> + <pathelement location="${M2_REPO}/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/> + <pathelement location="${M2_REPO}/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> + <pathelement location="${M2_REPO}/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> + <pathelement location="${M2_REPO}/org/richfaces/framework/richfaces-impl/3.1.0-SNAPSHOT/richfaces-impl-3.1.0-SNAPSHOT.jar"/> + <pathelement location="${M2_REPO}/javax/faces/jsf-api/1.1_02/jsf-api-1.1_02.jar"/> + <pathelement location="${M2_REPO}/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/> + <pathelement location="${M2_REPO}/htmlunit/htmlunit/1.10/htmlunit-1.10.jar"/> + <pathelement location="${M2_REPO}/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/> + <pathelement location="${M2_REPO}/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> + <pathelement location="${M2_REPO}/junit/junit/3.8.1/junit-3.8.1.jar"/> + <pathelement location="${M2_REPO}/commons-collections/commons-collections/3.0/commons-collections-3.0.jar"/> + <pathelement location="${M2_REPO}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/> + <pathelement location="${M2_REPO}/rhino/js/1.6R2/js-1.6R2.jar"/> + <pathelement location="${M2_REPO}/javax/faces/jsf-impl/1.1_02/jsf-impl-1.1_02.jar"/> + <pathelement location="${M2_REPO}/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> + + + </path> + <target name="init" depends="clean"> + <mkdir dir="target/clover/classes"/> + <clover-clean initstring="target/clover/clover.db" keepdb="false"/> + <clover-setup initstring="target/clover/clover.db" flushpolicy="interval" flushinterval="1000"> + <fileset dir="src" includes="**/*.java"/> + </clover-setup> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="target/classes" excludes="**/*.launch, **/*.java, **/*.class"/> + </copy> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="src" excludes="**/*.launch, **/*.java"/> + </copy> + <copy includeemptydirs="false" todir="target/clover/classes"> + <fileset dir="src" excludes="**/*.launch, **/*.java"/> + </copy> + </target> + <target name="clean"> + <delete dir="target/clover/classes"/> + <delete file="target/clover/richfaces-clovered-impl.jar"/> + </target> + <target depends="clean" name="cleanall"/> + <target depends="build-project" name="build"/> + <target depends="init" name="build-project"> + <echo message="${ant.project.name}: ${ant.file}"/> + + <javac source="1.4" srcdir="src" classpathref="common.classpath" debug="true" debuglevel="source,lines,vars" destdir="target/clover/classes" /> + + <jar destfile="target/clover/richfaces-clovered-impl.jar"> + <fileset dir="target/clover/classes" /> + </jar> + </target> +</project> Property changes on: branches/framework-shared/impl-shared/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Copied: branches/framework-shared/impl-shared/generatescript.xml (from rev 16649, branches/community/3.3.X/framework/impl/generatescript.xml) =================================================================== --- branches/framework-shared/impl-shared/generatescript.xml (rev 0) +++ branches/framework-shared/impl-shared/generatescript.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,157 @@ +<?xml version="1.0"?> + +<project name="assemblescripts" default="assembly"> + <description> + Assemble all javaScript library files to one AJAXJSF.js + </description> + + <property name="scripts-path" value="org/ajax4jsf/javascript/scripts"></property> + <property name="prototype-scripts-path" value="org/ajax4jsf/javascript/scripts"></property> + <property name="scriptaculous-scripts-path" value="org/richfaces/renderkit/html/scripts/scriptaculous"></property> + <property name="jquery-scripts-path" value="org/richfaces/renderkit/html/scripts/jquery"></property> + + <property name="target-dir" value="${project.build.directory}/javascript"></property> + + <property name="scripts.dir" + value="${target-dir}/${scripts-path}" + /> + <property name="prototype.scripts.dir" + value="${target-dir}/${prototype-scripts-path}" + /> + <property name="script" value="AJAX.js" /> + + <property name="script.rico" value="rico.js"></property> + <property name="script.aculo" value="scriptaculo.js"></property> + <property name="script.scriptaculous" value="scriptaculous.js"></property> + <property name="scriptaculous.scripts.dir" + value="${target-dir}/${scriptaculous-scripts-path}"/> + <property name="jquery.scripts.dir" + value="${target-dir}/${jquery-scripts-path}"/> + + <property name="script.prototype" value="prototype.js"></property> + <property name="script.jquery" value="jquery.js"></property> + + <property name="script.imagecache" value="imagecache.js"></property> + <property name="script.dnd" value="dnd.js"></property> + <property name="script.css-rules" value="css-rules.js"></property> + <filelist id="imagecache" dir="${basedir}/src/main/javascript/ajaxjsf" files="imagecache.js"></filelist> + + <filelist id="jquery" + dir="${basedir}/src/main/javascript/jquery" + files="jquery-1.3.2.js,../memory.js,patches.js"> + </filelist> + + <filelist id="scriptaculous" + dir="${basedir}/src/main/javascript/scriptaculous" + files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js" > + </filelist> + + + <filelist id="prototype" + dir="${basedir}/src/main/javascript/prototype" + files="prototype-1.6.0.3.js,../memory.js,patches.js"> + </filelist> + + + <filelist id="dnd" + dir="${basedir}/src/main/javascript/dnd" + files="prolog.js,dnd.js,epilog.js"> + </filelist> + + <filelist id="ajaxjsf" dir="${basedir}/src/main/javascript/ajaxjsf" files="prolog.js,sarissa.js,JSFAJAX.js,queue.js,log4ajax.js,epilog.js,../memory.js"></filelist> +  + <target name="assembly" + depends="depends" + description="--> Assemble all javaScript library files to one AJAXJSF.js" + > + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script}" + fixlastline="yes" + eol="unix" + > + <filelist refid="ajaxjsf"> + </filelist> + </concat> + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script.imagecache}" + fixlastline="yes" + eol="unix" + > + <filelist refid="imagecache"/> + </concat> + <concat append="false" + binary="false" + destfile="${scripts.dir}/${script.dnd}" + fixlastline="yes" + eol="unix" + > + <filelist refid="dnd"/> + </concat> + <concat append="false" + binary="false" + destfile="${prototype.scripts.dir}/${script.prototype}" + fixlastline="yes" + eol="unix"> + <filelist refid="prototype"> + </filelist> + </concat> + <concat append="false" + binary="false" + destfile="${scriptaculous.scripts.dir}/${script.scriptaculous}" + fixlastline="yes" + eol="unix" + > + <filelist refid="scriptaculous"></filelist> + </concat> + + <concat append="false" + binary="false" + destfile="${jquery.scripts.dir}/${script.jquery}" + fixlastline="yes" + eol="unix" + > + <filelist refid="jquery"></filelist> + </concat> + + + <copy todir="${prototype.scripts.dir}" file="${basedir}/src/main/javascript/ajaxjsf/smartposition.js"> + </copy> + <copy todir="${scriptaculous.scripts.dir}"> + <fileset dir="${basedir}/src/main/javascript/scriptaculous"></fileset> + </copy> + </target> + + +  + <target name="fixeol" depends="depends" description="--> Fix CR/LF in files"> + <fixcrlf srcdir="${basedir}" includes="*.js" eol="unix"> + </fixcrlf> + </target> + + +  + <target name="depends"> + </target> + +</project> + Added: branches/framework-shared/impl-shared/pom.xml =================================================================== --- branches/framework-shared/impl-shared/pom.xml (rev 0) +++ branches/framework-shared/impl-shared/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>framework</artifactId> + <groupId>org.richfaces</groupId> + <version>3.3.3-SNAPSHOT</version> + </parent> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-shared</artifactId> + <version>3.3.3-SNAPSHOT</version> + <name>impl-shared</name> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> + <plugin> +  + <artifactId>maven-install-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>javacc</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>javascript</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" value="${project.build.directory}/javascript" /> + </ant> + </tasks> + <resourceRoot>${project.build.directory}/javascript</resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-javascript-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>compress</goal> + </goals> + <configuration> + <nosuffix>false</nosuffix> + <outputDirectory>${project.build.directory}/compressed/</outputDirectory> + <aggregations> + <aggregation> + <insertNewLine>true</insertNewLine> + <output>${project.build.outputDirectory}/org/ajax4jsf/framework.pack.js</output> + <includes> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/prototype-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/AJAX-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery/jquery-min.js</include> + <include>${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/jquery.utils-min.js</include> + <include>${project.build.directory}/compressed/org/ajax4jsf/javascript/scripts/dnd-min.js</include> + <include>**/*-min.js</include> + </includes> + <excludes> + <exclude>**/*.pack.js</exclude> + <exclude>**/scriptaculous/*.js</exclude> + <exclude>**/extend-min.js</exclude> + <exclude>**/jquery.jcarousel-min.js</exclude> + <exclude>**/compressed.css</exclude> + </excludes> + </aggregation> + </aggregations> + <resources> + <resource> + <directory>target/javascript</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>jslint</id> + <phase>test</phase> + <goals> + <goal>jslint</goal> + </goals> + <configuration> + <includes> + <include>**/framework.pack.js</include> + </includes> + <resources> + <resource> + <directory>${project.build.outputDirectory}</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <includesAllSourceRoots>false</includesAllSourceRoots> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencies> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.6</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.3.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> +</project> Copied: branches/framework-shared/impl-shared/src/main/java/META-INF (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java/META-INF) Copied: branches/framework-shared/impl-shared/src/main/java/org (from rev 16649, branches/community/3.3.X/framework/impl/src/main/java/org) Modified: branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java =================================================================== --- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/impl-shared/src/main/java/org/ajax4jsf/component/UIDataAdaptorBase.java 2010-03-23 00:26:05 UTC (rev 16654) @@ -79,7 +79,7 @@ public final static DataModel EMPTY_MODEL = new ListDataModel( Collections.EMPTY_LIST); - private static final Log _log = LogFactory.getLog(UIDataAdaptor.class); + private static final Log _log = LogFactory.getLog(UIDataAdaptorBase.class); /** * Base class for visit data model at phases decode, validation and update Copied: branches/framework-shared/impl-shared/src/main/javacc (from rev 16649, branches/community/3.3.X/framework/impl/src/main/javacc) Copied: branches/framework-shared/impl-shared/src/main/javascript (from rev 16649, branches/community/3.3.X/framework/impl/src/main/javascript) Copied: branches/framework-shared/impl-shared/src/main/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/main/resources) Copied: branches/framework-shared/impl-shared/src/test/java (from rev 16649, branches/community/3.3.X/framework/impl/src/test/java) Copied: branches/framework-shared/impl-shared/src/test/resources (from rev 16649, branches/community/3.3.X/framework/impl/src/test/resources) Modified: branches/framework-shared/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2010-03-22 12:59:20 UTC (rev 16649) +++ branches/framework-shared/pom.xml 2010-03-23 00:26:05 UTC (rev 16654) @@ -1,144 +1,147 @@ -<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.3.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>framework</artifactId> - <version>3.3.3-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Java Server Faces AJAX framework</name> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.0.2</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_12</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_12</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15.B1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jstl</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - </dependencies> - <modules> -  - <module>api</module> - <module>impl</module> - <module>test</module> - <module>jsf-test</module> - </modules> - -</project> +<?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.3.3-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>framework</artifactId> + <version>3.3.3-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Java Server Faces AJAX framework</name> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_12</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.15.B1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> + <modules> +  + <module>api</module> + <module>impl</module> + <module>test</module> + <module>jsf-test</module> + <module>impl-shared</module> + <module>impl-jsf2</module> + </modules> + +</project> \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16653 - branches/community/3.3.X/ui/extendedDataTable/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2010-03-22 16:34:07 -0400 (Mon, 22 Mar 2010) New Revision: 16653 Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java Log: RF-7813 Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- branches/community/3.3.X/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-03-22 20:33:07 UTC (rev 16652) +++ branches/community/3.3.X/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2010-03-22 20:34:07 UTC (rev 16653) @@ -392,6 +392,11 @@ } } + public void resetState(){ + state = null; + setTableState(null); + } + @SuppressWarnings("unchecked") public Iterator<UIComponent> fixedChildren() { IteratorChain chain = new IteratorChain(getFacets().values().iterator());

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16652 - branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2010-03-22 16:33:07 -0400 (Mon, 22 Mar 2010) New Revision: 16652 Modified: branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java Log: RF-8440 Part2 - escaping labels Modified: branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-03-22 18:05:56 UTC (rev 16651) +++ branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-03-22 20:33:07 UTC (rev 16652) @@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Collection; @@ -270,26 +271,44 @@ private void initLabels(Map<String, String> map, ResourceBundle bundle1, ResourceBundle bundle2, UIFileUpload fileUpload) { int i = 0; + String key = null; + String value = null; for (String name : bundlesLables) { boolean found = false; if (labelAttribues[i] != null) { String attributeName = labelAttribues[i]; if (fileUpload.getAttributes().get(attributeName) != null) { - map.put(name, (String) fileUpload.getAttributes().get( - attributeName)); + String attribbuteValue = (String) fileUpload.getAttributes().get( + attributeName); + key = attributeName; + value = attribbuteValue; found = true; } } if (!found && (bundle1 != null || bundle2 != null)) { String label = getFromBundle(name, bundle1, bundle2); if (label != null) { - map.put(name, getFromBundle(name, bundle1, bundle2)); + key = name; + value = label; found = true; } } if (!found) { - map.put(name, defaultLables[i]); + key = name; + value = defaultLables[i]; } + if(key != null && value != null){ + try { + ResponseWriter writer = FacesContext.getCurrentInstance().getResponseWriter(); + StringWriter dumpingWriter = new StringWriter(); + ResponseWriter clonedWriter = writer.cloneWithWriter(dumpingWriter); + clonedWriter.writeText(value, null); + value = dumpingWriter.toString(); + map.put(key, value); + } catch (IOException e) { + e.printStackTrace(); + } + } i++; } }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r16651 - root/examples-sandbox/trunk/components/tables/src/main/webapp.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-03-22 14:05:56 -0400 (Mon, 22 Mar 2010) New Revision: 16651 Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml Log: RF-7852 ExtendedDataTable sample Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml =================================================================== --- root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-03-22 18:05:51 UTC (rev 16650) +++ root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-03-22 18:05:56 UTC (rev 16651) @@ -47,7 +47,13 @@ <h:selectBooleanCheckbox value="#{dataBean.state}"> <f:ajax render="extendedDataTable" /> </h:selectBooleanCheckbox> - <rich:extendedDataTable id="extendedDataTable" frozenColumns="2" value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data." styleClass="extendedDataTable"> + <rich:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2" value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data." styleClass="extendedDataTable"> + <f:facet name="header"> + <h:outputText value="Header of table."/> + </f:facet> + <f:facet name="footer"> + <h:outputText value="Footer of table."/> + </f:facet> <f:facet name="noData"> <h:outputText value="There isn't data." style="border: solid black 1px;"/> </f:facet> @@ -71,9 +77,15 @@ <rich:column id="column_email" width="300px"> <h:outputText value="#{record.EMail}" /> </rich:column> - <rich:column id="column_email1" width="300px"> - <h:outputText value="#{record.EMail}" /> + <rich:column id="column_company_name" width="300px"> + <h:outputText value="#{record.company.name}" /> </rich:column> + <rich:column id="column_company_state"> + <h:outputText value="#{record.company.state}" /> + </rich:column> + <rich:column id="column_company_phone"> + <h:outputText value="#{record.company.phone}" /> + </rich:column> </rich:extendedDataTable> <input type="submit" /> </h:form>

14 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2010