[richfaces-svn-commits] JBoss Rich Faces SVN: r18973 - in branches/RFPL-434: archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources and 72 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 25 15:14:53 EDT 2010
Author: nbelaevski
Date: 2010-08-25 15:14:48 -0400 (Wed, 25 Aug 2010)
New Revision: 18973
Added:
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/Logger.java
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/css/
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml
Removed:
branches/RFPL-434/core/commons/src/main/java/org/richfaces/JavaLogger.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/LogFactory.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/Logger.java
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/css/
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/rich/
Modified:
branches/RFPL-434/
branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml
branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java
branches/RFPL-434/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml
branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml
branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml
branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml
branches/RFPL-434/bom/pom.xml
branches/RFPL-434/cdk/maven-resources-plugin/pom.xml
branches/RFPL-434/cdk/parent/pom.xml
branches/RFPL-434/core/api/pom.xml
branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java
branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/PropertyUtils.java
branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java
branches/RFPL-434/core/api/src/main/java/org/richfaces/log/RichfacesLogger.java
branches/RFPL-434/core/impl/pom.xml
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/HtmlParser.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PollEventsManager.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PushEventsCounter.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/ServletStreamWriter.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/XMLResponseWriterState.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/VersionBean.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/DependencyInjectionServiceImpl.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/InitializationListener.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/css/CSSVisitorImpl.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/Util.java
branches/RFPL-434/core/impl/src/main/resources/META-INF/resources/richfaces.js
branches/RFPL-434/dist/readme-examples.txt
branches/RFPL-434/dist/readme-ui.txt
branches/RFPL-434/examples/core-demo/
branches/RFPL-434/examples/core-demo/pom.xml
branches/RFPL-434/examples/core-demo/src/main/java/org/richfaces/demo/PhaseTracker.java
branches/RFPL-434/examples/input-demo/pom.xml
branches/RFPL-434/examples/iteration-demo/pom.xml
branches/RFPL-434/examples/misc-demo/pom.xml
branches/RFPL-434/examples/output-demo/pom.xml
branches/RFPL-434/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
branches/RFPL-434/examples/repeater-demo/pom.xml
branches/RFPL-434/examples/richfaces-showcase/pom.xml
branches/RFPL-434/examples/richfaces-showcase/readme.txt
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml
branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
branches/RFPL-434/pom.xml
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java
branches/RFPL-434/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/log.js
branches/RFPL-434/ui/core/ui/src/test/java/org/richfaces/view/facelets/html/AttachQueueHandlerTest.java
branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java
branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
branches/RFPL-434/ui/input/ui/src/main/templates/autocomplete.template.xml
branches/RFPL-434/ui/input/ui/src/main/templates/inplaceInput.template.xml
branches/RFPL-434/ui/input/ui/src/main/templates/input.template.inc
branches/RFPL-434/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
branches/RFPL-434/ui/parent/pom.xml
Log:
Merged revisions 18943,18945-18959,18961-18962 via svnmerge from
https://svn.jboss.org/repos/richfaces/trunk
https://jira.jboss.org/browse/RFPL-434
Property changes on: branches/RFPL-434
___________________________________________________________________
Name: svnmerge-integrated
- /branches/RFPL-754:1-18909 /trunk:1-18938
+ /branches/RFPL-754:1-18909 /trunk:1-18969
Modified: branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -106,8 +106,8 @@
<configuration>
<webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes>
- <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes>
</configuration>
</execution>
</executions>
@@ -170,30 +170,12 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher are printed-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
<!-- Tests -->
<dependency>
<groupId>org.testng</groupId>
Modified: branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java
===================================================================
--- branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/richfaces/RichBean.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,7 +1,7 @@
package org.richfaces;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import org.richfaces.log.LoggerFactory;
+import org.richfaces.log.Logger;
import java.io.Serializable;
Modified: branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml
===================================================================
--- branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/api/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -75,12 +75,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-test-stage</artifactId>
<scope>test</scope>
Modified: branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml
===================================================================
--- branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/impl/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -91,12 +91,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-test-stage</artifactId>
<scope>test</scope>
Modified: branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml
===================================================================
--- branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-component/src/main/resources/archetype-resources/ui/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -90,12 +90,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-test-stage</artifactId>
<scope>test</scope>
Modified: branches/RFPL-434/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/RFPL-434/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/archetypes/richfaces-component-short/src/main/resources/archetype-resources/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -85,12 +85,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-test-stage</artifactId>
<scope>test</scope>
Modified: branches/RFPL-434/bom/pom.xml
===================================================================
--- branches/RFPL-434/bom/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/bom/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -185,18 +185,6 @@
<version>0.9.5</version>
</dependency>
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
<!-- Optional cache dependencies -->
<dependency>
<groupId>opensymphony</groupId>
Modified: branches/RFPL-434/cdk/maven-resources-plugin/pom.xml
===================================================================
--- branches/RFPL-434/cdk/maven-resources-plugin/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/cdk/maven-resources-plugin/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -78,10 +78,6 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
<dependency>
<groupId>com.yahoo.platform.yui</groupId>
Modified: branches/RFPL-434/cdk/parent/pom.xml
===================================================================
--- branches/RFPL-434/cdk/parent/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/cdk/parent/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -227,11 +227,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
<groupId>com.yahoo.platform.yui</groupId>
<artifactId>yuicompressor</artifactId>
<version>2.3.6</version>
Modified: branches/RFPL-434/core/api/pom.xml
===================================================================
--- branches/RFPL-434/core/api/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -41,10 +41,6 @@
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<!-- Provided dependencies -->
<dependency>
@@ -65,11 +61,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java
===================================================================
--- branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/application/ViewHandlerWrapper.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -24,9 +24,7 @@
package org.ajax4jsf.application;
import java.io.IOException;
-
import java.lang.reflect.Constructor;
-
import java.util.Locale;
import javax.faces.FacesException;
@@ -35,11 +33,9 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.Messages;
-
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-
/**
* Base wrapper for {@link javax.faces.application.ViewHandler} . By default, delegate all
* method calls to wrapped handler.
Modified: branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/PropertyUtils.java
===================================================================
--- branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/PropertyUtils.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/PropertyUtils.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -28,16 +28,13 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.text.MessageFormat;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-
/**
* @author Nick Belaevski
* @since 4.0
Modified: branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java
===================================================================
--- branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/javascript/ScriptUtils.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -40,8 +40,8 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.Messages;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* @author shura (latest modification by $Author: alexsmirnov $)
Modified: branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java
===================================================================
--- branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -25,14 +25,12 @@
import java.io.IOException;
import java.io.InputStream;
-
import java.net.URL;
import java.net.URLConnection;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-
/**
* Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method.
* Contains one utility method that gets {@link InputStream} from {@link URL} with caching disabled.
Modified: branches/RFPL-434/core/api/src/main/java/org/richfaces/log/RichfacesLogger.java
===================================================================
--- branches/RFPL-434/core/api/src/main/java/org/richfaces/log/RichfacesLogger.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/api/src/main/java/org/richfaces/log/RichfacesLogger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -3,9 +3,6 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* @author Anton Belevich
*
@@ -27,7 +24,7 @@
}
public Logger getLogger() {
- return LoggerFactory.getLogger(loggerName);
+ return LogFactory.getLogger(loggerName);
}
/**
Deleted: branches/RFPL-434/core/commons/src/main/java/org/richfaces/JavaLogger.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/JavaLogger.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/JavaLogger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,214 +0,0 @@
-/*
- * $Id: JavaLogger.java 16812 2010-04-26 20:43:19Z alexsmirnov $
- *
- * 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.richfaces;
-
-
-
-/**
- * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p>
- *
- * @author asmirnov at exadel.com
- */
-public class JavaLogger implements Logger {
-
- public static final String RICHFACES_LOG = "org.richfaces.cdk";
-
-
- private static final String DEFAULT_MESSAGE = "Exception";
-
-
- private final java.util.logging.Logger jdkLogger;
-
- JavaLogger(String category) {
- jdkLogger = java.util.logging.Logger.getLogger(category);
- }
-
- JavaLogger() {
- this(RICHFACES_LOG);
- }
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence)
- */
- public void debug(CharSequence content) {
- jdkLogger.fine(String.valueOf(content));
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#debug(java.lang.CharSequence, java.lang.Throwable)
- */
- public void debug(CharSequence content, Throwable error) {
- jdkLogger.log(java.util.logging.Level.FINE, String.valueOf(content), error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#debug(java.lang.Throwable)
- */
- public void debug(Throwable error) {
- jdkLogger.log(java.util.logging.Level.FINE, "", error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence)
- */
- public void error(CharSequence content) {
- jdkLogger.severe(String.valueOf(content));
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#error(java.lang.CharSequence, java.lang.Throwable)
- */
- public void error(CharSequence content, Throwable error) {
-
- jdkLogger.log(java.util.logging.Level.SEVERE, String.valueOf(content), error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#error(java.lang.Throwable)
- */
- public void error(Throwable error) {
-
- jdkLogger.log(java.util.logging.Level.SEVERE, "", error);
- }
-
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence)
- */
- public void info(CharSequence content) {
- jdkLogger.info(String.valueOf(content));
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#info(java.lang.CharSequence, java.lang.Throwable)
- */
- public void info(CharSequence content, Throwable error) {
- jdkLogger.log(java.util.logging.Level.INFO, String.valueOf(content), error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#info(java.lang.Throwable)
- */
- public void info(Throwable error) {
- jdkLogger.log(java.util.logging.Level.INFO, "", error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#isDebugEnabled()
- */
- public boolean isDebugEnabled() {
- return jdkLogger.isLoggable(java.util.logging.Level.FINE);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#isErrorEnabled()
- */
- public boolean isErrorEnabled() {
- return jdkLogger.isLoggable(java.util.logging.Level.SEVERE);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#isInfoEnabled()
- */
- public boolean isInfoEnabled() {
- return jdkLogger.isLoggable(java.util.logging.Level.INFO);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#isWarnEnabled()
- */
- public boolean isWarnEnabled() {
- return jdkLogger.isLoggable(java.util.logging.Level.WARNING);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence)
- */
- public void warn(CharSequence content) {
- jdkLogger.warning(String.valueOf(content));
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#warn(java.lang.CharSequence, java.lang.Throwable)
- */
- public void warn(CharSequence content, Throwable error) {
- jdkLogger.log(java.util.logging.Level.WARNING, String.valueOf(content), error);
- }
-
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.Logger#warn(java.lang.Throwable)
- */
- public void warn(Throwable error) {
- jdkLogger.log(java.util.logging.Level.WARNING, "", error);
- }
-
- public boolean isLogEnabled(Logger.Level level) {
- return jdkLogger.isLoggable(toJavaLevel(level));
- }
-
- public void log(org.richfaces.Logger.Level level, CharSequence content) {
- jdkLogger.log(toJavaLevel(level), String.valueOf(content));
-
- }
-
- public void log(org.richfaces.Logger.Level level, CharSequence content, Throwable error) {
- jdkLogger.log(toJavaLevel(level), String.valueOf(content),error);
- }
-
- public void log(org.richfaces.Logger.Level level, Throwable error) {
- jdkLogger.log(toJavaLevel(level),DEFAULT_MESSAGE, error);
- }
-
- private java.util.logging.Level toJavaLevel(Logger.Level level){
- switch (level) {
- case ERROR:
- return java.util.logging.Level.SEVERE;
- case INFO:
- return java.util.logging.Level.INFO;
- case WARNING:
- return java.util.logging.Level.WARNING;
- case DEBUG:
- return java.util.logging.Level.FINE;
- default :{
- //No level set
- throw new IllegalArgumentException("Logging level must be set to obtain a logger");
- }
- }
- }
-}
Deleted: branches/RFPL-434/core/commons/src/main/java/org/richfaces/LogFactory.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/LogFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/LogFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,61 +0,0 @@
-/*
- * $Id$
- *
- * 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.richfaces;
-
-/**
- * <p class="changed_added_4_0">This class produces loggers used by whole RichFaces library.</p>
- * @author asmirnov at exadel.com
- *
- */
-public final class LogFactory {
-
- private static final Logger DEFAULT_LOGGER = new JavaLogger();
-
- private LogFactory(){
- // This class is not instantiable.
- }
-
-
- /**
- * <p class="changed_added_4_0">This method creates default logger.</p>
- * @return
- */
- public static Logger getLogger(){
- return DEFAULT_LOGGER;
- }
-
- /**
- * <p class="changed_added_4_0">This method produces logger instance for given category.</p>
- * @param category
- * @return
- */
- public static Logger getLogger(String category){
- return new JavaLogger(category);
- }
-
- public static Logger getLogger(Class<?> clazz){
- return getLogger(clazz.getName());
- }
-
-}
Deleted: branches/RFPL-434/core/commons/src/main/java/org/richfaces/Logger.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/Logger.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/Logger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,174 +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.richfaces;
-
-
-/**
- * That interface hides current logging system from classes.
- * Concrete implementation should provide appropriate logger instance that delegates
- * messages to the current log system.
- *
- * @author shura
- */
-public interface Logger {
-
- public enum Level {
- ERROR,
- INFO,
- WARNING,
- DEBUG
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- * @return
- */
- public boolean isDebugEnabled();
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- */
- public void debug(CharSequence content);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- * @param error
- */
- public void debug(CharSequence content, Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param error
- */
- /**
- * <p class="changed_added_4_0"></p>
- * @param error
- */
- public void debug(Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @return
- */
- public boolean isInfoEnabled();
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- */
- public void info(CharSequence content);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- * @param error
- */
- public void info(CharSequence content, Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param error
- */
- public void info(Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @return
- */
- public boolean isWarnEnabled();
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- */
- public void warn(CharSequence content);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- * @param error
- */
- public void warn(CharSequence content, Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param error
- */
- public void warn(Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @return
- */
- public boolean isErrorEnabled();
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- */
- public void error(CharSequence content);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param content
- * @param error
- */
- public void error(CharSequence content, Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param error
- */
- public void error(Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param level
- * @return
- */
- public boolean isLogEnabled(Level level);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param level
- * @param content
- */
- public void log(Level level,CharSequence content);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param level
- * @param content
- * @param error
- */
- public void log(Level level,CharSequence content, Throwable error);
-
- /**
- * <p class="changed_added_4_0"></p>
- * @param level
- * @param error
- */
- public void log(Level level, Throwable error);
-
-}
Copied: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java (from rev 18939, branches/RFPL-434/core/commons/src/main/java/org/richfaces/JavaLogger.java)
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java (rev 0)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,182 @@
+/*
+ * $Id: JavaLogger.java 16812 2010-04-26 20:43:19Z alexsmirnov $
+ *
+ * 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.richfaces.log;
+
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.logging.LogRecord;
+
+
+
+
+/**
+ * <p class="changed_added_4_0">That logger delegates all calls to the JDK {@link java.util.logging.Logger}</p>
+ *
+ * @author asmirnov at exadel.com
+ * @author nick
+ */
+public class JavaLogger implements Logger {
+
+ public static final String RICHFACES_LOG = "org.richfaces.cdk";
+
+ private static final String CLASS_NAME = JavaLogger.class.getName();
+
+ private static final Map<Level, java.util.logging.Level> LEVELS_MAP =
+ new EnumMap<Level, java.util.logging.Level>(Level.class);
+
+ static {
+ LEVELS_MAP.put(Level.ERROR, java.util.logging.Level.SEVERE);
+ LEVELS_MAP.put(Level.INFO, java.util.logging.Level.INFO);
+ LEVELS_MAP.put(Level.WARNING, java.util.logging.Level.WARNING);
+ LEVELS_MAP.put(Level.DEBUG, java.util.logging.Level.FINE);
+ }
+
+ private final java.util.logging.Logger jdkLogger;
+
+ JavaLogger(String category) {
+ jdkLogger = java.util.logging.Logger.getLogger(category);
+ }
+
+ JavaLogger() {
+ this(RICHFACES_LOG);
+ }
+
+ private void fillCallerData(String fqn, LogRecord record) {
+ StackTraceElement[] stackTrace = new Exception().getStackTrace();
+
+ int i = 0;
+
+ for (; i < stackTrace.length; i++) {
+ if (fqn.equals(stackTrace[i].getClassName())) {
+ break;
+ }
+ }
+
+ int idx = i + 1;
+
+ for (; idx < stackTrace.length; idx++) {
+ if (!fqn.equals(stackTrace[idx].getClassName())) {
+ break;
+ }
+ }
+
+ if (idx < stackTrace.length) {
+ record.setSourceMethodName(stackTrace[idx].getMethodName());
+ record.setSourceClassName(stackTrace[idx].getClassName());
+ }
+ }
+
+ private LogRecord createRecord(Level level, CharSequence message, Throwable thrown) {
+ // millis and thread are filled by the constructor
+ LogRecord record = new LogRecord(LEVELS_MAP.get(level), message != null ? message.toString() : null);
+
+ //TODO resource bundle?
+ record.setLoggerName(jdkLogger.getName());
+ record.setThrown(thrown);
+ fillCallerData(CLASS_NAME, record);
+
+ return record;
+ }
+
+ public boolean isDebugEnabled() {
+ return isLogEnabled(Level.DEBUG);
+ }
+
+ public void debug(CharSequence content) {
+ log(Level.DEBUG, content);
+ }
+
+ public void debug(CharSequence content, Throwable thrown) {
+ log(Level.DEBUG, content, thrown);
+ }
+
+ public void debug(Throwable thrown) {
+ log(Level.DEBUG, thrown);
+ }
+
+ public boolean isInfoEnabled() {
+ return isLogEnabled(Level.INFO);
+ }
+
+ public void info(CharSequence content) {
+ log(Level.INFO, content);
+ }
+
+ public void info(CharSequence content, Throwable thrown) {
+ log(Level.INFO, content, thrown);
+ }
+
+ public void info(Throwable thrown) {
+ log(Level.INFO, thrown);
+ }
+
+ public boolean isWarnEnabled() {
+ return isLogEnabled(Level.WARNING);
+ }
+
+ public void warn(CharSequence content) {
+ log(Level.WARNING, content);
+ }
+
+ public void warn(CharSequence content, Throwable thrown) {
+ log(Level.WARNING, content, thrown);
+ }
+
+ public void warn(Throwable thrown) {
+ log(Level.WARNING, thrown);
+ }
+
+ public boolean isErrorEnabled() {
+ return isLogEnabled(Level.ERROR);
+ }
+
+ public void error(CharSequence content) {
+ log(Level.ERROR, content);
+ }
+
+ public void error(CharSequence content, Throwable thrown) {
+ log(Level.ERROR, content, thrown);
+ }
+
+ public void error(Throwable thrown) {
+ log(Level.ERROR, thrown);
+ }
+
+ public boolean isLogEnabled(Level level) {
+ return jdkLogger.isLoggable(LEVELS_MAP.get(level));
+ }
+
+ public void log(Level level, CharSequence content) {
+ jdkLogger.log(createRecord(level, content, null));
+ }
+
+ public void log(Level level, CharSequence content, Throwable thrown) {
+ jdkLogger.log(createRecord(level, content, thrown));
+ }
+
+ public void log(Level level, Throwable thrown) {
+ jdkLogger.log(createRecord(level, null, thrown));
+ }
+
+}
Copied: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java (from rev 18939, branches/RFPL-434/core/commons/src/main/java/org/richfaces/LogFactory.java)
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java (rev 0)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,61 @@
+/*
+ * $Id$
+ *
+ * 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.richfaces.log;
+
+/**
+ * <p class="changed_added_4_0">This class produces loggers used by whole RichFaces library.</p>
+ * @author asmirnov at exadel.com
+ *
+ */
+public final class LogFactory {
+
+ private static final Logger DEFAULT_LOGGER = new JavaLogger();
+
+ private LogFactory(){
+ // This class is not instantiable.
+ }
+
+
+ /**
+ * <p class="changed_added_4_0">This method creates default logger.</p>
+ * @return
+ */
+ public static Logger getLogger(){
+ return DEFAULT_LOGGER;
+ }
+
+ /**
+ * <p class="changed_added_4_0">This method produces logger instance for given category.</p>
+ * @param category
+ * @return
+ */
+ public static Logger getLogger(String category){
+ return new JavaLogger(category);
+ }
+
+ public static Logger getLogger(Class<?> clazz){
+ return getLogger(clazz.getName());
+ }
+
+}
Copied: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/Logger.java (from rev 18939, branches/RFPL-434/core/commons/src/main/java/org/richfaces/Logger.java)
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/Logger.java (rev 0)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/Logger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,212 @@
+/**
+ * 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.richfaces.log;
+
+/**
+ * That interface hides current logging system from classes. Concrete implementation should provide appropriate logger
+ * instance that delegates messages to the current log system.
+ *
+ * @author shura
+ */
+public interface Logger {
+
+ public enum Level {
+ ERROR, INFO, WARNING, DEBUG
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return
+ */
+ public boolean isDebugEnabled();
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ */
+ public void debug(CharSequence content);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ * @param error
+ */
+ public void debug(CharSequence content, Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param error
+ */
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param error
+ */
+ public void debug(Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return
+ */
+ public boolean isInfoEnabled();
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ */
+ public void info(CharSequence content);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ * @param error
+ */
+ public void info(CharSequence content, Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param error
+ */
+ public void info(Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return
+ */
+ public boolean isWarnEnabled();
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ */
+ public void warn(CharSequence content);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ * @param error
+ */
+ public void warn(CharSequence content, Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param error
+ */
+ public void warn(Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return
+ */
+ public boolean isErrorEnabled();
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ */
+ public void error(CharSequence content);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param content
+ * @param error
+ */
+ public void error(CharSequence content, Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param error
+ */
+ public void error(Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param level
+ * @return
+ */
+ public boolean isLogEnabled(Level level);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param level
+ * @param content
+ */
+ public void log(Level level, CharSequence content);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param level
+ * @param content
+ * @param error
+ */
+ public void log(Level level, CharSequence content, Throwable error);
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param level
+ * @param error
+ */
+ public void log(Level level, Throwable error);
+
+
+}
Modified: branches/RFPL-434/core/impl/pom.xml
===================================================================
--- branches/RFPL-434/core/impl/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -47,10 +47,6 @@
<groupId>net.sourceforge.cssparser</groupId>
<artifactId>cssparser</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -116,11 +112,6 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -30,7 +30,7 @@
import org.ajax4jsf.webapp.BaseFilter;
import org.ajax4jsf.webapp.FilterServletResponseWrapper;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.faces.FacesException;
import javax.faces.application.Resource;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycle.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -22,7 +22,7 @@
package org.ajax4jsf.application;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/application/DebugLifecycleFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -22,7 +22,7 @@
package org.ajax4jsf.application;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -32,7 +32,7 @@
import org.ajax4jsf.cache.lru.LRUMapCacheFactory;
import org.ajax4jsf.resource.util.URLToStreamHelper;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* TODO stop caches on application stop
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/EhCacheCacheFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -14,7 +14,7 @@
import org.ajax4jsf.context.ContextInitParameters;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/JBossCacheCacheFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -24,7 +24,7 @@
import org.jboss.cache.eviction.EvictionAlgorithmConfigBase;
import org.jboss.cache.eviction.ExpirationAlgorithmConfig;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -35,7 +35,7 @@
import org.ajax4jsf.context.ContextInitParameters;
import org.ajax4jsf.resource.util.URLToStreamHelper;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import com.opensymphony.oscache.base.AbstractCacheAdministrator;
import com.opensymphony.oscache.general.GeneralCacheAdministrator;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/cache/lru/LRUMapCacheFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -29,7 +29,7 @@
import org.ajax4jsf.cache.CacheFactory;
import org.ajax4jsf.context.ContextInitParameters;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Nick - mailto:nbelaevski at exadel.com
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxRegionBrige.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -24,7 +24,7 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.event.AjaxEvent;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.el.ELContext;
import javax.el.MethodExpression;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/component/AjaxViewRoot.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -29,7 +29,7 @@
import org.ajax4jsf.event.EventsQueue;
import org.ajax4jsf.renderkit.AjaxContainerRenderer;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.el.MethodExpression;
import javax.faces.FacesException;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/config/FrameworkConfiguration.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -2,7 +2,7 @@
import org.ajax4jsf.util.ELUtils;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -55,7 +55,7 @@
import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* This class incapsulated
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/AjaxPhaseListener.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -30,8 +30,8 @@
import javax.faces.event.PhaseListener;
import org.ajax4jsf.context.AjaxContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* Listener for act before Render phase to set RenderKit Id for current skin.
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/event/InitPhaseListener.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -23,7 +23,7 @@
import org.ajax4jsf.application.AjaxViewHandler;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxChildrenRenderer.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,21 +21,22 @@
package org.ajax4jsf.renderkit;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
import org.ajax4jsf.Messages;
import org.ajax4jsf.component.AjaxChildrenEncoder;
import org.ajax4jsf.component.AjaxOutput;
import org.ajax4jsf.context.AjaxContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
/**
* @author shura
*/
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxContainerRenderer.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,20 +21,21 @@
package org.ajax4jsf.renderkit;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
import org.ajax4jsf.Messages;
import org.ajax4jsf.component.AjaxContainer;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-
/**
* Base renderer for all AJAX - subview components.
*
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -54,8 +54,8 @@
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.application.ServiceTracker;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* @author shura
@@ -133,6 +133,8 @@
public static final String AJAX_COMPONENT_ID_PARAMETER = "org.richfaces.ajax.component";
public static final String BEHAVIOR_EVENT_PARAMETER = "javax.faces.behavior.event";
+ public static final String QUEUE_ID_ATTRIBUTE = "queueId";
+
private static final String BEFOREDOMUPDATE_ELEMENT_NAME = "beforedomupdate";
private static final String COMPLETE_ELEMENT_NAME = "complete";
private static final String DATA_ELEMENT_NAME = "data";
@@ -324,6 +326,11 @@
if (isNotEmpty(handlerScript)) {
ajaxEventOptions.set(behaviorName, handlerScript);
}
+
+ String queueId = getQueueId(component);
+ if (isNotEmpty(queueId)) {
+ ajaxEventOptions.set(QUEUE_ID_ATTRIBUTE, queueId);
+ }
ajaxEventOptions.set("incId", "1");
}
@@ -723,6 +730,10 @@
// return statusId;
}
+ public static String getQueueId(UIComponent component) {
+ return (String) component.getAttributes().get(QUEUE_ID_ATTRIBUTE);
+ }
+
public static JSFunctionDefinition buildAjaxOncomplete(String body) {
JSFunctionDefinition function = new JSFunctionDefinition("request", "event", "data");
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/ChameleonRenderKitFactory.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,17 +21,18 @@
package org.ajax4jsf.renderkit;
-import org.ajax4jsf.Messages;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import java.util.Iterator;
import javax.faces.FactoryFinder;
import javax.faces.application.ApplicationFactory;
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import java.util.Iterator;
+import org.ajax4jsf.Messages;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
/**
* @author shura (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:58:50 $
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -30,11 +30,11 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.resource.InternetResource;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.renderkit.RenderKitUtils;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
-import org.slf4j.Logger;
/**
* Base Renderer for all chameleon Skin's and components.
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,18 +21,19 @@
package org.ajax4jsf.resource;
-import org.ajax4jsf.Messages;
-import org.richfaces.log.RichfacesLogger;
-import org.richfaces.util.Util;
-import org.slf4j.Logger;
-
-import javax.faces.context.FacesContext;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.Messages;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+import org.richfaces.util.Util;
+
/**
* Base class for all Html page resources - images, scripts, styles etc. Realise
* as "brige" pattern - different subclasses for different resource source
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -45,8 +45,8 @@
import org.ajax4jsf.resource.util.URLToStreamHelper;
import org.ajax4jsf.webapp.BaseFilter;
import org.ajax4jsf.webapp.WebXml;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
public class InternetResourceService {
static final String ENABLE_CACHING_PARAMETER = "enable-cache";
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/OneTimeRenderer.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,14 +21,15 @@
package org.ajax4jsf.resource;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
import org.ajax4jsf.Messages;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-import java.util.Map;
-
/**
* Base class for resources, rendered only one time in page ( JavaScript, CSS )
*
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,8 +21,8 @@
package org.ajax4jsf.resource;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import java.io.IOException;
+import java.util.Locale;
import javax.faces.FacesException;
import javax.faces.FactoryFinder;
@@ -34,9 +34,10 @@
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.render.RenderKitFactory;
-import java.io.IOException;
-import java.util.Locale;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
/**
* Lifecycle for simulate faces request processing for resource.
*
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/resource/ScriptRenderer.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,15 +21,15 @@
package org.ajax4jsf.resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
import org.ajax4jsf.Messages;
import org.ajax4jsf.javascript.JSMin;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
class CountingOutputStream extends OutputStream {
private int written = 0;
private OutputStream outputStream;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,9 +21,15 @@
package org.ajax4jsf.util;
-import org.ajax4jsf.Messages;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import javax.el.ELContext;
import javax.el.ValueExpression;
@@ -38,16 +44,11 @@
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.model.SelectItem;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import org.ajax4jsf.Messages;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
/**
* @author Maksim Kaszynski
*/
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,11 +21,6 @@
package org.ajax4jsf.util;
-import org.ajax4jsf.resource.util.URLToStreamHelper;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-
-import javax.faces.FacesException;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -33,6 +28,12 @@
import java.util.HashMap;
import java.util.Map;
+import javax.faces.FacesException;
+
+import org.ajax4jsf.resource.util.URLToStreamHelper;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
/**
* @author shura
*/
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,14 +21,16 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.Messages;
-import org.ajax4jsf.context.AjaxContext;
-import org.ajax4jsf.renderkit.AjaxContainerRenderer;
-import org.ajax4jsf.request.MultipartRequest;
-import org.ajax4jsf.resource.InternetResourceService;
-import org.richfaces.component.FileUploadConstants;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
import javax.faces.application.ViewHandler;
import javax.servlet.Filter;
@@ -42,17 +44,16 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
+import org.ajax4jsf.Messages;
+import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.renderkit.AjaxContainerRenderer;
+import org.ajax4jsf.request.MultipartRequest;
+import org.ajax4jsf.resource.InternetResourceService;
+import org.richfaces.component.FileUploadConstants;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
/**
* Base class for request processing filters, with convert Htmp content to XML
* for ajax requests, and serve request to application off-page resources
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,12 +21,11 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.Messages;
-import org.ajax4jsf.application.AjaxViewHandler;
-import org.ajax4jsf.context.ContextInitParameters;
-import org.ajax4jsf.renderkit.AjaxContainerRenderer;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.Map;
import javax.faces.application.ViewExpiredException;
import javax.servlet.FilterChain;
@@ -37,12 +36,14 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.Map;
+import org.ajax4jsf.Messages;
+import org.ajax4jsf.application.AjaxViewHandler;
+import org.ajax4jsf.context.ContextInitParameters;
+import org.ajax4jsf.renderkit.AjaxContainerRenderer;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+
public abstract class BaseXMLFilter {
public static final String AJAX_EXPIRED = "Ajax-Expired";
public static final String APPLICATION_XHTML_XML = "application/xhtml+xml";
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,15 +21,6 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.io.FastBufferOutputStream;
-import org.ajax4jsf.io.FastBufferWriter;
-import org.richfaces.log.RichfacesLogger;
-import org.richfaces.util.Util;
-import org.slf4j.Logger;
-
-import javax.faces.context.ExternalContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -40,6 +31,16 @@
import java.util.Map;
import java.util.Map.Entry;
+import javax.faces.context.ExternalContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
+import org.ajax4jsf.io.FastBufferOutputStream;
+import org.ajax4jsf.io.FastBufferWriter;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+import org.richfaces.util.Util;
+
/**
* @author shura (latest modification by $Author: alexsmirnov $)
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:58:20 $
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/FilterServletResponseWrapper.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -35,19 +35,6 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.Messages;
-import org.ajax4jsf.io.FastBufferInputStream;
-import org.ajax4jsf.io.FastBufferOutputStream;
-import org.ajax4jsf.io.FastBufferReader;
-import org.ajax4jsf.io.FastBufferWriter;
-import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import org.xml.sax.InputSource;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -61,6 +48,20 @@
import java.util.Locale;
import java.util.Map;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+import org.ajax4jsf.Messages;
+import org.ajax4jsf.io.FastBufferInputStream;
+import org.ajax4jsf.io.FastBufferOutputStream;
+import org.ajax4jsf.io.FastBufferReader;
+import org.ajax4jsf.io.FastBufferWriter;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+import org.xml.sax.InputSource;
+
/**
* Base wrapper save JSF page response, for parse to XML with different parsers
*
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/HtmlParser.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/HtmlParser.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/HtmlParser.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,13 +21,13 @@
package org.ajax4jsf.webapp;
-import org.w3c.dom.Node;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
+import org.w3c.dom.Node;
+
public interface HtmlParser {
public abstract void parseHtml(InputStream input, Writer output) throws IOException;
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PollEventsManager.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PollEventsManager.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PollEventsManager.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,11 +21,12 @@
package org.ajax4jsf.webapp;
-import javax.servlet.ServletContext;
import java.io.Serializable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import javax.servlet.ServletContext;
+
/**
* @author asmirnov
*/
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PushEventsCounter.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PushEventsCounter.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/PushEventsCounter.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,11 +21,11 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.event.PushEventListener;
-
import java.io.Serializable;
import java.util.EventObject;
+import org.ajax4jsf.event.PushEventListener;
+
public class PushEventsCounter implements PushEventListener, Serializable {
/**
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/ServletStreamWriter.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/ServletStreamWriter.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/ServletStreamWriter.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,10 +21,11 @@
package org.ajax4jsf.webapp;
-import javax.servlet.ServletOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import javax.servlet.ServletOutputStream;
+
/**
* HACK - for case if servlet response already use Writer, create wrapper to stream -
* since most of serializers use outputStream. In future, must be replaced by Dual serialization
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -31,8 +31,8 @@
import org.ajax4jsf.config.WebXMLParser;
import org.richfaces.VersionBean;
import org.richfaces.VersionBean.Version;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* Parse at startup application web.xml and store servlet and filter mappings.
Modified: branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/XMLResponseWriterState.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/XMLResponseWriterState.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/ajax4jsf/webapp/XMLResponseWriterState.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,11 +21,12 @@
package org.ajax4jsf.webapp;
-import org.ajax4jsf.Messages;
+import java.io.IOException;
import javax.faces.component.UIComponent;
-import java.io.IOException;
+import org.ajax4jsf.Messages;
+
/**
* @author shura Class to implement state pattern for
* <code>ResponceWriter</code> Real states must extend this. By
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -32,6 +32,7 @@
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
/**
@@ -44,7 +45,7 @@
public static final Version VERSION = new Version();
- private static final org.slf4j.Logger LOGGER = RichfacesLogger.APPLICATION.getLogger();
+ private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger();
/**
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/DependencyInjectionServiceImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/DependencyInjectionServiceImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/DependencyInjectionServiceImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -42,11 +42,11 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.resource.PostConstructResource;
import org.richfaces.resource.ResourceParameter;
import org.richfaces.resource.ResourceParameterELResolver;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/InitializationListener.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -39,8 +39,8 @@
import org.ajax4jsf.context.ContextInitParameters;
import org.richfaces.VersionBean;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -72,8 +72,8 @@
import org.ajax4jsf.model.Range;
import org.ajax4jsf.model.SerializableDataModel;
import org.richfaces.context.ExtendedVisitContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* Base class for iterable components, like dataTable, Tomahawk dataList, Facelets repeat, tree etc., with support for
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -45,8 +45,8 @@
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.MetaComponentEncoder;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractBaseResource.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -39,9 +39,9 @@
import org.richfaces.application.ServiceTracker;
import org.richfaces.application.Uptime;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.Util;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/AbstractCacheableResource.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -31,9 +31,9 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.context.ContextInitParameters;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.Util;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CachedResourceImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -41,9 +41,9 @@
import org.ajax4jsf.io.ByteBuffer;
import org.ajax4jsf.io.FastBufferInputStream;
import org.ajax4jsf.io.FastBufferOutputStream;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.Util;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/CompiledCSSResource.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -33,11 +33,11 @@
import javax.faces.application.Resource;
import javax.faces.context.FacesContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.resource.css.CSSVisitorImpl;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
-import org.slf4j.Logger;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.CSSParseException;
import org.w3c.css.sac.ErrorHandler;
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -26,9 +26,8 @@
import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
/**
* @author Nick Belaevski
@@ -65,249 +64,175 @@
logResourceProblem(context, null, "Resource {0} was not found", resourceData);
}
- public String getName() {
- return LOGGER.getName();
- }
-
- public boolean isTraceEnabled() {
- return LOGGER.isTraceEnabled();
- }
-
- public void trace(String msg) {
- LOGGER.trace(msg);
- }
-
- public void trace(String format, Object arg) {
- LOGGER.trace(format, arg);
- }
-
- public void trace(String format, Object arg1, Object arg2) {
- LOGGER.trace(format, arg1, arg2);
- }
-
- public void trace(String format, Object[] argArray) {
- LOGGER.trace(format, argArray);
- }
-
- public void trace(String msg, Throwable t) {
- LOGGER.trace(msg, t);
- }
-
- public boolean isTraceEnabled(Marker marker) {
- return LOGGER.isTraceEnabled(marker);
- }
-
- public void trace(Marker marker, String msg) {
- LOGGER.trace(marker, msg);
- }
-
- public void trace(Marker marker, String format, Object arg) {
- LOGGER.trace(marker, format, arg);
- }
-
- public void trace(Marker marker, String format, Object arg1, Object arg2) {
- LOGGER.trace(marker, format, arg1, arg2);
- }
-
- public void trace(Marker marker, String format, Object[] argArray) {
- LOGGER.trace(marker, format, argArray);
- }
-
- public void trace(Marker marker, String msg, Throwable t) {
- LOGGER.trace(marker, msg, t);
- }
-
+ /**
+ * @return
+ * @see org.richfaces.log.Logger#isDebugEnabled()
+ */
public boolean isDebugEnabled() {
return LOGGER.isDebugEnabled();
}
- public void debug(String msg) {
- LOGGER.debug(msg);
+ /**
+ * @param content
+ * @see org.richfaces.log.Logger#debug(java.lang.CharSequence)
+ */
+ public void debug(CharSequence content) {
+ LOGGER.debug(content);
}
- public void debug(String format, Object arg) {
- LOGGER.debug(format, arg);
+ /**
+ * @param content
+ * @param error
+ * @see org.richfaces.log.Logger#debug(java.lang.CharSequence, java.lang.Throwable)
+ */
+ public void debug(CharSequence content, Throwable error) {
+ LOGGER.debug(content, error);
}
- public void debug(String format, Object arg1, Object arg2) {
- LOGGER.debug(format, arg1, arg2);
+ /**
+ * @param error
+ * @see org.richfaces.log.Logger#debug(java.lang.Throwable)
+ */
+ public void debug(Throwable error) {
+ LOGGER.debug(error);
}
- public void debug(String format, Object[] argArray) {
- LOGGER.debug(format, argArray);
- }
-
- public void debug(String msg, Throwable t) {
- LOGGER.debug(msg, t);
- }
-
- public boolean isDebugEnabled(Marker marker) {
- return LOGGER.isDebugEnabled(marker);
- }
-
- public void debug(Marker marker, String msg) {
- LOGGER.debug(marker, msg);
- }
-
- public void debug(Marker marker, String format, Object arg) {
- LOGGER.debug(marker, format, arg);
- }
-
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- LOGGER.debug(marker, format, arg1, arg2);
- }
-
- public void debug(Marker marker, String format, Object[] argArray) {
- LOGGER.debug(marker, format, argArray);
- }
-
- public void debug(Marker marker, String msg, Throwable t) {
- LOGGER.debug(marker, msg, t);
- }
-
+ /**
+ * @return
+ * @see org.richfaces.log.Logger#isInfoEnabled()
+ */
public boolean isInfoEnabled() {
return LOGGER.isInfoEnabled();
}
- public void info(String msg) {
- LOGGER.info(msg);
+ /**
+ * @param content
+ * @see org.richfaces.log.Logger#info(java.lang.CharSequence)
+ */
+ public void info(CharSequence content) {
+ LOGGER.info(content);
}
- public void info(String format, Object arg) {
- LOGGER.info(format, arg);
+ /**
+ * @param content
+ * @param error
+ * @see org.richfaces.log.Logger#info(java.lang.CharSequence, java.lang.Throwable)
+ */
+ public void info(CharSequence content, Throwable error) {
+ LOGGER.info(content, error);
}
- public void info(String format, Object arg1, Object arg2) {
- LOGGER.info(format, arg1, arg2);
+ /**
+ * @param error
+ * @see org.richfaces.log.Logger#info(java.lang.Throwable)
+ */
+ public void info(Throwable error) {
+ LOGGER.info(error);
}
- public void info(String format, Object[] argArray) {
- LOGGER.info(format, argArray);
- }
-
- public void info(String msg, Throwable t) {
- LOGGER.info(msg, t);
- }
-
- public boolean isInfoEnabled(Marker marker) {
- return LOGGER.isInfoEnabled(marker);
- }
-
- public void info(Marker marker, String msg) {
- LOGGER.info(marker, msg);
- }
-
- public void info(Marker marker, String format, Object arg) {
- LOGGER.info(marker, format, arg);
- }
-
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- LOGGER.info(marker, format, arg1, arg2);
- }
-
- public void info(Marker marker, String format, Object[] argArray) {
- LOGGER.info(marker, format, argArray);
- }
-
- public void info(Marker marker, String msg, Throwable t) {
- LOGGER.info(marker, msg, t);
- }
-
+ /**
+ * @return
+ * @see org.richfaces.log.Logger#isWarnEnabled()
+ */
public boolean isWarnEnabled() {
return LOGGER.isWarnEnabled();
}
- public void warn(String msg) {
- LOGGER.warn(msg);
+ /**
+ * @param content
+ * @see org.richfaces.log.Logger#warn(java.lang.CharSequence)
+ */
+ public void warn(CharSequence content) {
+ LOGGER.warn(content);
}
- public void warn(String format, Object arg) {
- LOGGER.warn(format, arg);
+ /**
+ * @param content
+ * @param error
+ * @see org.richfaces.log.Logger#warn(java.lang.CharSequence, java.lang.Throwable)
+ */
+ public void warn(CharSequence content, Throwable error) {
+ LOGGER.warn(content, error);
}
- public void warn(String format, Object[] argArray) {
- LOGGER.warn(format, argArray);
+ /**
+ * @param error
+ * @see org.richfaces.log.Logger#warn(java.lang.Throwable)
+ */
+ public void warn(Throwable error) {
+ LOGGER.warn(error);
}
- public void warn(String format, Object arg1, Object arg2) {
- LOGGER.warn(format, arg1, arg2);
- }
-
- public void warn(String msg, Throwable t) {
- LOGGER.warn(msg, t);
- }
-
- public boolean isWarnEnabled(Marker marker) {
- return LOGGER.isWarnEnabled(marker);
- }
-
- public void warn(Marker marker, String msg) {
- LOGGER.warn(marker, msg);
- }
-
- public void warn(Marker marker, String format, Object arg) {
- LOGGER.warn(marker, format, arg);
- }
-
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- LOGGER.warn(marker, format, arg1, arg2);
- }
-
- public void warn(Marker marker, String format, Object[] argArray) {
- LOGGER.warn(marker, format, argArray);
- }
-
- public void warn(Marker marker, String msg, Throwable t) {
- LOGGER.warn(marker, msg, t);
- }
-
+ /**
+ * @return
+ * @see org.richfaces.log.Logger#isErrorEnabled()
+ */
public boolean isErrorEnabled() {
return LOGGER.isErrorEnabled();
}
- public void error(String msg) {
- LOGGER.error(msg);
+ /**
+ * @param content
+ * @see org.richfaces.log.Logger#error(java.lang.CharSequence)
+ */
+ public void error(CharSequence content) {
+ LOGGER.error(content);
}
- public void error(String format, Object arg) {
- LOGGER.error(format, arg);
+ /**
+ * @param content
+ * @param error
+ * @see org.richfaces.log.Logger#error(java.lang.CharSequence, java.lang.Throwable)
+ */
+ public void error(CharSequence content, Throwable error) {
+ LOGGER.error(content, error);
}
- public void error(String format, Object arg1, Object arg2) {
- LOGGER.error(format, arg1, arg2);
+ /**
+ * @param error
+ * @see org.richfaces.log.Logger#error(java.lang.Throwable)
+ */
+ public void error(Throwable error) {
+ LOGGER.error(error);
}
- public void error(String format, Object[] argArray) {
- LOGGER.error(format, argArray);
+ /**
+ * @param level
+ * @return
+ * @see org.richfaces.log.Logger#isLogEnabled(org.richfaces.log.Logger.Level)
+ */
+ public boolean isLogEnabled(Level level) {
+ return LOGGER.isLogEnabled(level);
}
- public void error(String msg, Throwable t) {
- LOGGER.error(msg, t);
+ /**
+ * @param level
+ * @param content
+ * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.CharSequence)
+ */
+ public void log(Level level, CharSequence content) {
+ LOGGER.log(level, content);
}
- public boolean isErrorEnabled(Marker marker) {
- return LOGGER.isErrorEnabled(marker);
+ /**
+ * @param level
+ * @param content
+ * @param error
+ * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.CharSequence, java.lang.Throwable)
+ */
+ public void log(Level level, CharSequence content, Throwable error) {
+ LOGGER.log(level, content, error);
}
- public void error(Marker marker, String msg) {
- LOGGER.error(marker, msg);
+ /**
+ * @param level
+ * @param error
+ * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.Throwable)
+ */
+ public void log(Level level, Throwable error) {
+ LOGGER.log(level, error);
}
- public void error(Marker marker, String format, Object arg) {
- LOGGER.error(marker, format, arg);
- }
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- LOGGER.error(marker, format, arg1, arg2);
- }
- public void error(Marker marker, String format, Object[] argArray) {
- LOGGER.error(marker, format, argArray);
- }
-
- public void error(Marker marker, String msg, Throwable t) {
- LOGGER.error(marker, msg, t);
- }
-
-
}
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/css/CSSVisitorImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/css/CSSVisitorImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/css/CSSVisitorImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -32,8 +32,8 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.util.ELUtils;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
import org.w3c.dom.css.CSSCharsetRule;
import org.w3c.dom.css.CSSFontFaceRule;
import org.w3c.dom.css.CSSImportRule;
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/PropertiesUtil.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -29,8 +29,8 @@
import java.util.Properties;
import org.ajax4jsf.resource.util.URLToStreamHelper;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/Util.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/Util.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/util/Util.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -82,9 +82,9 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.util.base64.Codec;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.resource.StateHolderResource;
-import org.slf4j.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/core/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- branches/RFPL-434/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-08-25 19:14:48 UTC (rev 18973)
@@ -143,27 +143,54 @@
return s.replace(CSS_METACHARS_PATTERN, "\\$1");
};
+ var logImpl;
+
+ richfaces.setLog = function(newLogImpl) {
+ logImpl = newLogImpl;
+ };
+
richfaces.log = {
debug: function(text) {
+ if (logImpl) {
+ logImpl.debug(text);
+ }
},
info: function(text) {
+ if (logImpl) {
+ logImpl.info(text);
+ }
},
warn: function(text) {
+ if (logImpl) {
+ logImpl.warn(text);
+ }
},
error: function(text) {
+ if (logImpl) {
+ logImpl.error(text);
+ }
},
setLevel: function(level) {
+ if (logImpl) {
+ logImpl.setLevel(level);
+ }
},
getLevel: function() {
+ if (logImpl) {
+ return logImpl.getLevel();
+ }
return 'info';
},
clear: function() {
+ if (logImpl) {
+ logImpl.clear();
+ }
}
};
Modified: branches/RFPL-434/dist/readme-examples.txt
===================================================================
--- branches/RFPL-434/dist/readme-examples.txt 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/dist/readme-examples.txt 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,6 +1,6 @@
RichFaces 4.0 Examples
=========================================================
-Version 4.0.0.M1
+Version 4.0.0.M2
This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
@@ -21,6 +21,8 @@
More additional information about build profiles for concrete applications and working with them - inside readme's for application itself.
+NEW for M2: richfaces-showcase contains readme.txt which shows how to publish the application to Google Application Engine.
+
Using IDE to work with examples
-------------------------------
*You could use Jboss Tools with m2eclipse plugin and just import the examples as maven-based projects.
Modified: branches/RFPL-434/dist/readme-ui.txt
===================================================================
--- branches/RFPL-434/dist/readme-ui.txt 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/dist/readme-ui.txt 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,6 +1,6 @@
RichFaces - Ajax enabled JSF 2.0 component library
=========================================================
-Version 4.0.0.M1
+Version 4.0.0.M2
This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).
@@ -8,16 +8,18 @@
-------------------------------
1) Put RichFaces libraries and its dependencies in your application libraries folder:
- 1.1) richfaces-commons-api-4.0.0.20100713-M1.jar
- 1.2) richfaces-core-api-4.0.0.20100713-M1.jar
- 1.3) richfaces-core-impl-4.0.0.20100713-M1.jar
- 1.4) richfaces-components-api-4.0.0.20100713-M1.jar
- 1.5) richfaces-components-impl-4.0.0.20100713-M1.jar
- 1.6) richfaces-components-ui-4.0.0.20100713-M1.jar
- 1.7) slf4j-api
- 1.8) slf4j-log4j12 (or whatever else - select the implementation according to logging framework that you use)
+ 1.1) richfaces-commons-api-4.0.0.20100824-M2.jar
+ 1.2) richfaces-core-api-4.0.0.20100824-M2.jar
+ 1.3) richfaces-core-impl-4.0.0.20100824-M2.jar
+ 1.4) richfaces-components-api-4.0.0.20100824-M2.jar
+ 1.5) richfaces-components-ui-4.0.0.20100824-M2.jar
+ 1.6) slf4j-api
+ 1.7) slf4j-log4j12 (or whatever else - select the implementation according to logging framework that you use)
+ 1.8) sac-1.3, cssparser-0.9.5 - required for components CSS work
+ 1.9) google-guava-r06 - core runtime dependency.
For optimal performance it's recommended to add one of these caching frameworks to application classpath: EhCache, JBoss Cache, OsCache.
+
2) As opposed to the previous 3.x.y versions of RichFaces, no special configuration steps are necessary.
You don't need to modify web.xml or faces-config.xml
@@ -26,7 +28,7 @@
Use xmlns:a4j="http://richfaces.org/a4j" namespace for core components
Use xmlns:rich="http://richfaces.org/rich" namespace for rich components
-4) Add one of the available RichFaces 4.0.M1 components to your page and try it!
+4) Add one of the available RichFaces 4.0.M2 components to your page and try it!
4.1) Take a look at the RichFaces examples for assistance with usage.
Available Components/Behaviors/Tags/Functions
@@ -80,14 +82,21 @@
---------------------------------
Output:
---------------------------------
-rich:divPanel
rich:panel
rich:popupPanel
rich:togglePanel
rich:toggleControl
rich:togglePanelItem
rich:itemChangeListener
+rich:accordion
+rich:accordionItem
+---------------------------------
+Output:
+---------------------------------
+rich:autocomplete
+rich:inplaceInput
+rich:inputNumberSlider
Learn more
----------
Property changes on: branches/RFPL-434/examples/core-demo
___________________________________________________________________
Name: svn:ignore
- target
.settings
.project
.classpath
.clover
.externalToolBuilders
+ target
.settings
.project
.classpath
.clover
.externalToolBuilders
bin
Modified: branches/RFPL-434/examples/core-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/core-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/core-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -39,22 +39,6 @@
<dependencyManagement>
<dependencies>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -87,14 +71,6 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
<build>
Modified: branches/RFPL-434/examples/core-demo/src/main/java/org/richfaces/demo/PhaseTracker.java
===================================================================
--- branches/RFPL-434/examples/core-demo/src/main/java/org/richfaces/demo/PhaseTracker.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/core-demo/src/main/java/org/richfaces/demo/PhaseTracker.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -27,8 +27,8 @@
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.richfaces.log.LogFactory;
+import org.richfaces.log.Logger;
/**
* @author Nick Belaevski
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 6358081870120864332L;
- private Logger logger = LoggerFactory.getLogger(PhaseTracker.class);
+ private Logger logger = LogFactory.getLogger(PhaseTracker.class);
private ThreadLocal<Long> phaseTimer = new ThreadLocal<Long>();
Modified: branches/RFPL-434/examples/input-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/input-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/input-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -83,8 +83,8 @@
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes>
- <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes>
</configuration>
</execution>
</executions>
@@ -131,38 +131,12 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
<!-- Tests -->
<dependency>
<groupId>org.testng</groupId>
Modified: branches/RFPL-434/examples/iteration-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/iteration-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/iteration-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -39,22 +39,6 @@
<dependencyManagement>
<dependencies>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -71,14 +55,6 @@
<groupId>org.richfaces.ui.misc</groupId>
<artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<!-- API implementation for runtime -->
Modified: branches/RFPL-434/examples/misc-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/misc-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/misc-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -39,22 +39,6 @@
<dependencyManagement>
<dependencies>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -96,15 +80,6 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
Modified: branches/RFPL-434/examples/output-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/output-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/output-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -87,8 +87,8 @@
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory>
<classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes>
- <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes>
+ <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</packagingExcludes>
+ <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes>
</configuration>
</execution>
</executions>
@@ -135,38 +135,12 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
<!-- Tests -->
<dependency>
<groupId>org.testng</groupId>
Modified: branches/RFPL-434/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java
===================================================================
--- branches/RFPL-434/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/output-demo/src/main/java/org/richfaces/TogglePanelBean.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,15 +1,15 @@
package org.richfaces;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
import java.io.Serializable;
+import org.richfaces.log.LogFactory;
+import org.richfaces.log.Logger;
+
public class TogglePanelBean implements Serializable {
private static final long serialVersionUID = -2403138958014741653L;
- private static final Logger LOGGER = LoggerFactory.getLogger(TogglePanelBean.class);
+ private static final Logger LOGGER = LogFactory.getLogger(TogglePanelBean.class);
private String name;
Modified: branches/RFPL-434/examples/repeater-demo/pom.xml
===================================================================
--- branches/RFPL-434/examples/repeater-demo/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/repeater-demo/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -40,22 +40,6 @@
<dependencyManagement>
<dependencies>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: branches/RFPL-434/examples/richfaces-showcase/pom.xml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -54,20 +54,6 @@
<artifactId>ehcache</artifactId>
</dependency>
- <!-- simple logger binding: only messages of level INFO and higher
- are printed -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
-
- <!-- Log4J dependency used in examples -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
</dependencies>
<build>
@@ -124,17 +110,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <version>2.2</version>
+ </dependency>
<dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <scope>runtime</scope>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
Modified: branches/RFPL-434/examples/richfaces-showcase/readme.txt
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/readme.txt 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/readme.txt 2010-08-25 19:14:48 UTC (rev 18973)
@@ -38,5 +38,20 @@
You can find more details in the RichFaces Getting Started Guide (visit documentation page at http://jboss.org/richfaces)
+2) Publishing to Google Application Engine
+
+In M2 we completed resource plugin which generates static resources and that allow us to create Google App Engine compatible application using RichFaces.
+just execute
+ * mvn clean package -Pgae -Denforcer.skip=true
+(enforcer skipped as resource plugin using snapshot plugin)
+And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation.
+
+more details about the resource plugin(it could be highly usefull not only in case of GAE usage but for general cases like serving resources at separate content systems) -
+will be published at our wiki and announced at RichFaces usage space.
+
+There are some additional changes were made in order to make richfaces-showcase GAE compatible:
+ * WebConfiguration class from com.sun.faces were patched removing code which is not compatible with GAE
+ * web.xml with additional properties for GAE created and placed at src\main\webapp-gae\WEB-INF\ (it replaces common one durinf build with GAE profile)
+ * check pom.xml GAE profile section in order to check additional dependencies for that configuration.
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase)
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,3 +0,0 @@
-rich-message{
- color:red;
-}
\ No newline at end of file
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.css 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,3 @@
+rich-message{
+ color:red;
+}
\ No newline at end of file
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:composite="http://java.sun.com/jsf/composite"
- xmlns:a4j="http://richfaces.org/a4j">
-<head>
-<title>panel</title>
-</head>
-<body>
-
-<composite:interface>
- <composite:attribute name="for" required="true" />
- <composite:attribute name="style" required="false" />
- <composite:attribute name="styleClass" required="false" />
-</composite:interface>
-
-<composite:implementation>
- <h:outputStylesheet library="org.richfaces.showcase" name="message.css" />
- <a4j:outputPanel ajaxRendered="true" layout="none">
- <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}"
- showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}"
- styleClass="rich-message #{cc.attrs.styleClass}" />
- </a4j:outputPanel>
-</composite:implementation>
-</body>
-</html>
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/message.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite"
+ xmlns:a4j="http://richfaces.org/a4j">
+<head>
+<title>panel</title>
+</head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="for" required="true" />
+ <composite:attribute name="style" required="false" />
+ <composite:attribute name="styleClass" required="false" />
+</composite:interface>
+
+<composite:implementation>
+ <h:outputStylesheet library="org.richfaces.showcase" name="message.css" />
+ <a4j:outputPanel ajaxRendered="true" layout="none">
+ <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}"
+ showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}"
+ styleClass="rich-message #{cc.attrs.styleClass}" />
+ </a4j:outputPanel>
+</composite:implementation>
+</body>
+</html>
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,3 +0,0 @@
-rich-messages{
- color:red;
-}
\ No newline at end of file
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.css 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,3 @@
+rich-messages{
+ color:red;
+}
\ No newline at end of file
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:composite="http://java.sun.com/jsf/composite"
- xmlns:a4j="http://richfaces.org/a4j">
-<head>
-<title>panel</title>
-</head>
-<body>
-
-<composite:interface>
- <composite:attribute name="style" required="false" />
- <composite:attribute name="styleClass" required="false" />
-</composite:interface>
-
-<composite:implementation>
- <h:outputStylesheet library="org.richfaces.showcase" name="messages.css" />
- <a4j:outputPanel ajaxRendered="true" layout="none">
- <h:messages layout="#{cc.attrs.layout}"
- showSummary="true" style="color:red; #{cc.attrs.style}"
- styleClass="rich-message #{cc.attrs.styleClass}" />
- </a4j:outputPanel>
-</composite:implementation>
-</body>
-</html>
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/messages.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite"
+ xmlns:a4j="http://richfaces.org/a4j">
+<head>
+<title>panel</title>
+</head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="style" required="false" />
+ <composite:attribute name="styleClass" required="false" />
+</composite:interface>
+
+<composite:implementation>
+ <h:outputStylesheet library="org.richfaces.showcase" name="messages.css" />
+ <a4j:outputPanel ajaxRendered="true" layout="none">
+ <h:messages layout="#{cc.attrs.layout}"
+ showSummary="true" style="color:red; #{cc.attrs.style}"
+ styleClass="rich-message #{cc.attrs.styleClass}" />
+ </a4j:outputPanel>
+</composite:implementation>
+</body>
+</html>
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,96 +0,0 @@
-.rich-page {
- width: 100%;
-}
-
-body {
- background-color: #FFFFFF;
- margin: 10px;
-}
-
-.header_bg {
- background-image:
- "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
- border-bottom: 1px solid #FFFFFF;
- background-color: '#{richSkin.headerBackgroundColor}';
- background-repeat: repeat-x;
- background-position: top left;
-}
-
-.footer_bg {
- background-image:
- "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
- border-top: 1px solid #FFFFFF;
- background-color: '#{richSkin.headerBackgroundColor}';
- background-repeat: repeat-x;
- background-position: center left;
-}
-
-.menu_col {
- background-color: '#{richSkin.generalBackgroundColor}';
- vertical-align: top;
- border-top: 10px solid #FFFFFF;
- border-right: 10px solid #FFFFFF;
- border-bottom: 10px solid #FFFFFF;
-}
-
-.content_col {
- background-color: #FFFFFF;
- vertical-align: top;
- width: 100%;
- border-top: 10px solid #FFFFFF;
- border-bottom: 10px solid #FFFFFF;
-}
-
-*.menu_col,*.content_col,*.footer_bg {
- font-family: '#{richSkin.generalFamilyFont}';
- color: '#{richSkin.generalTextColor}';
- font-size: '#{richSkin.generalSizeFont}';
-}
-
-*.header_content {
- font-family: '#{richSkin.generalFamilyFont}';
- color: '#{richSkin.headerTextColor}';
- font-size: '#{richSkin.generalSizeFont}';
- padding-left: 20px;
-}
-
-.page_size {
- width: 100%;
- height: 100%;
-}
-
-.header_content {
- margin: 0px 0px 0px 0px;
- position: relative
-}
-
-.spacer {
- font-size: 1px;
-}
-
-.footer_bg_content {
- padding:20px;
- margin: 0px 0px 0px 0px;
-}
-
-.new_marker {
- color: red;
- vertical-align: super;
- font-size: 8px;
- padding-left: 2px;
-}
-
-.header_links_container, .header_links_container a:visited, .header_links_container * {
- color: '#{richSkin.headerTextColor}';
-}
-
-.header_links_container {
- padding-right: 20px;
-}
-
-.skin-chooser{
-margin-bottom: 3px;
-}
-.samples-navigator{
-margin-bottom: 10px;
-}
\ No newline at end of file
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.ecss 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,96 @@
+.rich-page {
+ width: 100%;
+}
+
+body {
+ background-color: #FFFFFF;
+ margin: 10px;
+}
+
+.header_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
+ border-bottom: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: top left;
+}
+
+.footer_bg {
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
+ border-top: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: center left;
+}
+
+.menu_col {
+ background-color: '#{richSkin.generalBackgroundColor}';
+ vertical-align: top;
+ border-top: 10px solid #FFFFFF;
+ border-right: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
+}
+
+.content_col {
+ background-color: #FFFFFF;
+ vertical-align: top;
+ width: 100%;
+ border-top: 10px solid #FFFFFF;
+ border-bottom: 10px solid #FFFFFF;
+}
+
+*.menu_col,*.content_col,*.footer_bg {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.generalTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+}
+
+*.header_content {
+ font-family: '#{richSkin.generalFamilyFont}';
+ color: '#{richSkin.headerTextColor}';
+ font-size: '#{richSkin.generalSizeFont}';
+ padding-left: 20px;
+}
+
+.page_size {
+ width: 100%;
+ height: 100%;
+}
+
+.header_content {
+ margin: 0px 0px 0px 0px;
+ position: relative
+}
+
+.spacer {
+ font-size: 1px;
+}
+
+.footer_bg_content {
+ padding:20px;
+ margin: 0px 0px 0px 0px;
+}
+
+.new_marker {
+ color: red;
+ vertical-align: super;
+ font-size: 8px;
+ padding-left: 2px;
+}
+
+.header_links_container, .header_links_container a:visited, .header_links_container * {
+ color: '#{richSkin.headerTextColor}';
+}
+
+.header_links_container {
+ padding-right: 20px;
+}
+
+.skin-chooser{
+margin-bottom: 3px;
+}
+.samples-navigator{
+margin-bottom: 10px;
+}
\ No newline at end of file
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:composite="http://java.sun.com/jsf/composite">
- <head>
- <title>page</title>
- </head>
-<body>
-
-<composite:interface>
- <composite:attribute name="style" />
- <composite:attribute name="styleClass"/>
- <composite:attribute name="headerClass"/>
- <composite:attribute name="bodyClass"/>
- <composite:attribute name="sidebarClass"/>
-</composite:interface>
-<composite:implementation>
-<h:outputText value="<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" escape="false"/>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<h:head>
- <title>#{cc.attrs.pageTitle}</title>
- <composite:renderFacet name="pageHeader"/>
-</h:head>
-<h:body>
- <h:outputStylesheet name="rich/css/page.ecss" />
- <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}">
- <tbody>
- <tr>
- <td class="header_bg">
- <div class="header_content rich-page-header #{cc.attrs.headerClass}">
- <composite:renderFacet name="header"/>
- </div>
- </td>
- </tr>
- <tr>
- <td width="100%" height="100%" class="bg_tabbody">
- <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{cc.attrs.contentClass}">
- <tbody>
- <tr>
- <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}">
- <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div>
- <composite:renderFacet name="sidebar"/>
- </td>
- <td class="content_col rich-page-body #{cc.attrs.bodyClass}">
- <composite:insertChildren />
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- <tr>
- <td class="footer_bg">
- <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}">
- <composite:renderFacet name="footer"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
-</h:body>
-</html>
-</composite:implementation>
-</body>
-</html>
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/page.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+ <head>
+ <title>page</title>
+ </head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="style" />
+ <composite:attribute name="styleClass"/>
+ <composite:attribute name="headerClass"/>
+ <composite:attribute name="bodyClass"/>
+ <composite:attribute name="sidebarClass"/>
+</composite:interface>
+<composite:implementation>
+<h:outputText value="<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" escape="false"/>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<h:head>
+ <title>#{cc.attrs.pageTitle}</title>
+ <composite:renderFacet name="pageHeader"/>
+</h:head>
+<h:body>
+ <h:outputStylesheet name="rich/css/page.ecss" />
+ <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}">
+ <tbody>
+ <tr>
+ <td class="header_bg">
+ <div class="header_content rich-page-header #{cc.attrs.headerClass}">
+ <composite:renderFacet name="header"/>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td width="100%" height="100%" class="bg_tabbody">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{cc.attrs.contentClass}">
+ <tbody>
+ <tr>
+ <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}">
+ <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div>
+ <composite:renderFacet name="sidebar"/>
+ </td>
+ <td class="content_col rich-page-body #{cc.attrs.bodyClass}">
+ <composite:insertChildren />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="footer_bg">
+ <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}">
+ <composite:renderFacet name="footer"/>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</h:body>
+</html>
+</composite:implementation>
+</body>
+</html>
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,28 +0,0 @@
-.rich-panel {
- border-width: 1px;
- border-style: solid;
- padding: 1px;
- color: '#{richSkin.generalTextColor}';
- font-family: '#{richSkin.generalFamilyFont}';
- font-size: '#{richSkin.generalSizeFont}';
- background-color: '#{richSkin.generalBackgroundColor}';
- border-color: '#{richSkin.panelBorderColor}';
-}
-
-.rich-panel-header {
- padding: 7px 20px;
- border-width: 1px;
- border-style: solid;
- background-color: '#{richSkin.headerBackgroundColor}';
- border-color: '#{richSkin.panelBorderColor}';
- font-weight: bold;
- background-position: left top;
- background-repeat: repeat-x;
- background-image:
- "url(#{resource['org.richfaces.demo.images.PanelGradient']})";
- color: '#{richSkin.headerTextColor}';
-}
-
-.rich-panel-body {
- padding: 10px;
-}
\ No newline at end of file
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.ecss 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,28 @@
+.rich-panel {
+ border-width: 1px;
+ border-style: solid;
+ padding: 1px;
+ color: '#{richSkin.generalTextColor}';
+ font-family: '#{richSkin.generalFamilyFont}';
+ font-size: '#{richSkin.generalSizeFont}';
+ background-color: '#{richSkin.generalBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-panel-header {
+ padding: 7px 20px;
+ border-width: 1px;
+ border-style: solid;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ font-weight: bold;
+ background-position: left top;
+ background-repeat: repeat-x;
+ background-image:
+ "url(#{resource['org.richfaces.demo.images.PanelGradient']})";
+ color: '#{richSkin.headerTextColor}';
+}
+
+.rich-panel-body {
+ padding: 10px;
+}
\ No newline at end of file
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:composite="http://java.sun.com/jsf/composite">
- <head>
- <title>panel</title>
- </head>
-<body>
-
-<composite:interface>
- <composite:attribute name="id" required="false"/>
- <composite:attribute name="style" required="false"/>
- <composite:attribute name="styleClass" required="false"/>
- <composite:attribute name="headerClass" required="false"/>
- <composite:attribute name="bodyClass" required="false"/>
-</composite:interface>
-
-<composite:implementation>
- <h:outputStylesheet library="org.richfaces.showcase" name="panel.ecss" />
-
- <div class="rich-panel #{cc.attrs.styleClass}" id="#{cc.attrs.id}"
- style="#{cc.attrs.style}"
- onclick="#{cc.attrs.onclick}"
- ondblclick="#{cc.attrs.ondblclick}"
- onkeydown="#{cc.attrs.onkeydown}"
- onkeypress="#{cc.attrs.onkeypress}"
- onkeyup="#{cc.attrs.onkeyup}"
- onmousedown="#{cc.attrs.onmousedown}"
- onmousemove="#{cc.attrs.onmousemove}"
- onmouseout="#{cc.attrs.onmouseout}"
- onmouseover="#{cc.attrs.onmouseover}"
- onmouseup="#{cc.attrs.onmouseup}">
-
- <h:panelGroup rendered="#{not empty cc.facets.header}">
- <div class="rich-panel-header #{cc.attrs.headerClass}">
- <composite:renderFacet name="header"/>
- </div>
- </h:panelGroup>
- <div class="rich-panel-body #{cc.attrs.bodyClass}" >
- <composite:insertChildren />
- </div>
-
- </div>
-</composite:implementation>
-</body>
-</html>
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/panel.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite">
+ <head>
+ <title>panel</title>
+ </head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="id" required="false"/>
+ <composite:attribute name="style" required="false"/>
+ <composite:attribute name="styleClass" required="false"/>
+ <composite:attribute name="headerClass" required="false"/>
+ <composite:attribute name="bodyClass" required="false"/>
+</composite:interface>
+
+<composite:implementation>
+ <h:outputStylesheet library="org.richfaces.showcase" name="panel.ecss" />
+
+ <div class="rich-panel #{cc.attrs.styleClass}" id="#{cc.attrs.id}"
+ style="#{cc.attrs.style}"
+ onclick="#{cc.attrs.onclick}"
+ ondblclick="#{cc.attrs.ondblclick}"
+ onkeydown="#{cc.attrs.onkeydown}"
+ onkeypress="#{cc.attrs.onkeypress}"
+ onkeyup="#{cc.attrs.onkeyup}"
+ onmousedown="#{cc.attrs.onmousedown}"
+ onmousemove="#{cc.attrs.onmousemove}"
+ onmouseout="#{cc.attrs.onmouseout}"
+ onmouseover="#{cc.attrs.onmouseover}"
+ onmouseup="#{cc.attrs.onmouseup}">
+
+ <h:panelGroup rendered="#{not empty cc.facets.header}">
+ <div class="rich-panel-header #{cc.attrs.headerClass}">
+ <composite:renderFacet name="header"/>
+ </div>
+ </h:panelGroup>
+ <div class="rich-panel-body #{cc.attrs.bodyClass}" >
+ <composite:insertChildren />
+ </div>
+
+ </div>
+</composite:implementation>
+</body>
+</html>
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich)
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/css (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/rich/css)
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml 2010-08-25 00:34:33 UTC (rev 18962)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:composite="http://java.sun.com/jsf/composite"
- xmlns:a4j="http://richfaces.org/a4j">
- <head>
- <title>toolBar</title>
- </head>
-<body>
-
-<composite:interface>
- <composite:attribute name="items" required="true"/>
-</composite:interface>
-<composite:implementation>
- <table>
- <tbody>
- <a4j:repeat value="#{cc.attrs.items}" var="item">
- <tr>
- <td>
- <h:link value="#{item.name}" outcome="#{item.outcome}" />
- </td>
- </tr>
- </a4j:repeat>
- </tbody>
- </table>
-</composite:implementation>
-</body>
-</html>
\ No newline at end of file
Copied: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml (from rev 18962, trunk/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml)
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml (rev 0)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/resources/org.richfaces.showcase/toolBar.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:composite="http://java.sun.com/jsf/composite"
+ xmlns:a4j="http://richfaces.org/a4j">
+ <head>
+ <title>toolBar</title>
+ </head>
+<body>
+
+<composite:interface>
+ <composite:attribute name="items" required="true"/>
+</composite:interface>
+<composite:implementation>
+ <table>
+ <tbody>
+ <a4j:repeat value="#{cc.attrs.items}" var="item">
+ <tr>
+ <td>
+ <h:link value="#{item.name}" outcome="#{item.outcome}" />
+ </td>
+ </tr>
+ </a4j:repeat>
+ </tbody>
+ </table>
+</composite:implementation>
+</body>
+</html>
\ No newline at end of file
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -3,7 +3,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<ui:composition template="/templates/main.xhtml">
<ui:define name="demoSampleParameters">
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -6,7 +6,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:r="http://java.sun.com/jsf/composite/rich">
+ xmlns:r="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<h:form id="form">
<r:messages />
<rich:dataTable value="#{carsBean.allInventoryItems}" var="car"
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
- xmlns:r="http://java.sun.com/jsf/composite/rich">
+ xmlns:r="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<h:form>
<rich:panel id="psnel">
<f:facet name="header">
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -5,7 +5,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
- xmlns:r="http://java.sun.com/jsf/composite/rich">
+ xmlns:r="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<rich:panel>
<h:form id="form">
<a4j:queue requestDelay="#{queueBean.requestDelay}" />
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<ui:composition>
<h:form>
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<ui:composition>
<p>This section overviews main principles of standard components
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/navigation.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<rich:panel style="width:300px" bodyClass="">
<f:facet name="header">
<h:outputText value="Navigation" />
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/includes/skin-chooser.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase">
<ui:composition>
<rich:panel styleClass="skin-chooser">
Modified: branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/webapp/templates/main.xhtml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -3,16 +3,29 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
+ xmlns:rich="http://java.sun.com/jsf/composite/org.richfaces.showcase"
xmlns:a4j="http://richfaces.org/a4j">
<f:view>
<ui:insert name="demoSampleParameters"/>
<h:head>
- <title>Components Gallery</title>
+<title>Components Gallery</title>
+<script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-7306415-3']);
+ _gaq.push(['_trackPageview']);
+ (function() {
+ if (window.location.hostname.indexOf("appspot.com") != -1) {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ }
+ })();
+
+</script>
</h:head>
<h:body>
- <h:outputStylesheet name="rich/css/page.ecss" />
+ <h:outputStylesheet library="org.richfaces.showcase" name="page.ecss" />
<table border="0" cellpadding="0" cellspacing="0"
class="rich-page header_bg #{cc.attrs.pageClass}">
<tbody>
Modified: branches/RFPL-434/pom.xml
===================================================================
--- branches/RFPL-434/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-root</artifactId>
+ <artifactId>richfaces-root-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Richfaces Aggregator</name>
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -33,6 +33,7 @@
import javax.faces.event.PostAddToViewEvent;
import org.ajax4jsf.component.behavior.AjaxBehavior;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.JsfRenderer;
@@ -56,8 +57,6 @@
public static final String COMPONENT_FAMILY = "org.richfaces.AttachQueue";
- public static final String QUEUE_ID_ATTRIBUTE = "queueId";
-
private transient List<UIComponent> componentsToAssociate;
private transient List<AjaxBehavior> behaviorsToAssociate;
@@ -93,7 +92,7 @@
}
private static void immediateAssociateWith(UIComponent component, String queueId) {
- component.getAttributes().put(QUEUE_ID_ATTRIBUTE, queueId);
+ component.getAttributes().put(AjaxRendererUtils.QUEUE_ID_ATTRIBUTE, queueId);
}
private static void immediateAssociateWith(AjaxBehavior behavior, String queueId) {
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/component/QueueRegistry.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -29,7 +29,7 @@
import javax.faces.context.FacesContext;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Nick Belaevski
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -34,7 +34,7 @@
import org.ajax4jsf.renderkit.HandlersChain;
import org.ajax4jsf.renderkit.RendererBase;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author asmirnov at exadel.com (latest modification by $Author: alexsmirnov $)
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -36,9 +36,10 @@
import org.ajax4jsf.context.ContextInitParameters;
import org.richfaces.component.QueueRegistry;
+import org.richfaces.log.Logger;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+
/**
* @author Nick Belaevski Base class for rendering Queue
*/
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -38,9 +38,12 @@
import javax.faces.view.BehaviorHolderAttachedObjectTarget;
import javax.faces.view.facelets.BehaviorConfig;
import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.CompositeFaceletHandler;
import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.FaceletHandler;
import javax.faces.view.facelets.MetaRule;
import javax.faces.view.facelets.TagException;
+import javax.faces.view.facelets.TagHandler;
import org.ajax4jsf.component.behavior.AjaxBehavior;
import org.richfaces.component.AbstractAttachQueue;
@@ -57,6 +60,31 @@
super(config);
}
+ public boolean isWrapping() {
+ if (this.nextHandler instanceof TagHandler) {
+ return !(this.nextHandler instanceof AttachQueueHandler);
+ }
+
+ if (this.nextHandler instanceof CompositeFaceletHandler) {
+ FaceletHandler[] handlers = ((CompositeFaceletHandler) this.nextHandler).getHandlers();
+ for (FaceletHandler handler : handlers) {
+ if (handler instanceof TagHandler) {
+ if (handler instanceof AttachQueueHandler) {
+ continue;
+ }
+
+ return true;
+ }
+
+ if (handler instanceof CompositeFaceletHandler) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
Application application = ctx.getFacesContext().getApplication();
@@ -81,7 +109,7 @@
BehaviorInfo behaviorInfo = ajaxBehaviors.popBehavior();
if (behaviorInfo != null) {
- if (behaviorInfo.isWrapping()) {
+ if (isWrapping()) {
AbstractAttachQueue attachQueue = attachQueueInfo.getAttachQueue();
if (attachQueue != null) {
List<ClientBehavior> behaviors = behaviorInfo.getBehaviors();
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -80,13 +80,6 @@
}
}
- void markWrapping() {
- if (!behaviorStack.isEmpty()) {
- BehaviorInfoImpl behaviorInfo = behaviorStack.getFirst();
- behaviorInfo.markWrapping();
- }
- }
-
public void pushBehavior(FacesContext context, ClientBehavior clientBehavior, String behaviorId, String eventName) {
Object behaviorState = ((StateHolder) clientBehavior).saveState(context);
@@ -107,7 +100,6 @@
public List<ClientBehavior> getBehaviors();
- public boolean isWrapping();
}
private static class BehaviorInfoImpl implements BehaviorInfo {
@@ -116,7 +108,6 @@
private Object behaviorState;
private String eventName;
private List<ClientBehavior> behaviors;
- private boolean wrapping = false;
public BehaviorInfoImpl(String behaviorId, String eventName, Object behaviorState) {
this.behaviorId = behaviorId;
@@ -146,14 +137,6 @@
return behaviors;
}
- public boolean isWrapping() {
- return wrapping;
- }
-
- private void markWrapping() {
- wrapping = true;
- }
-
private boolean shouldAddBehavior(ClientBehaviorHolder behaviorHolder, String eventName) {
if (!behaviorHolder.getEventNames().contains(eventName)) {
return false;
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -36,8 +36,6 @@
import javax.faces.view.facelets.Tag;
import javax.faces.view.facelets.TagAttribute;
-import org.richfaces.component.AbstractAttachQueue;
-
/**
* @author Nick Belaevski
*/
@@ -102,10 +100,6 @@
BehaviorStack behaviorStack = BehaviorStack.getBehaviorStack(facesContext, false);
if (behaviorStack != null && !behaviorStack.isEmpty()) {
- if (!(c instanceof AbstractAttachQueue)) {
- behaviorStack.markWrapping();
- }
-
if (c instanceof ClientBehaviorHolder) {
ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) c;
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -23,6 +23,9 @@
package org.richfaces.view.facelets.html;
+import java.util.Locale;
+
+import javax.faces.application.Application;
import javax.faces.view.facelets.BehaviorHandler;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.ConverterHandler;
@@ -30,16 +33,40 @@
import javax.faces.view.facelets.TagHandlerDelegateFactory;
import javax.faces.view.facelets.ValidatorHandler;
+import org.richfaces.log.RichfacesLogger;
+import org.richfaces.log.Logger;
+
/**
* @author Nick Belaevski
*/
public class BehaviorsTagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory {
+
+ private static final Logger LOGGER = RichfacesLogger.WEBAPP.getLogger();
+
private TagHandlerDelegateFactory factory;
+ private boolean isMyFaces = false;
+
public BehaviorsTagHandlerDelegateFactoryImpl(TagHandlerDelegateFactory factory) {
this.factory = factory;
+ detectMyFaces();
}
+ private void detectMyFaces() {
+ String implementationTitle = Application.class.getPackage().getImplementationTitle();
+ if (implementationTitle != null) {
+ isMyFaces = implementationTitle.toLowerCase(Locale.US).contains("myfaces");
+
+ if (isMyFaces) {
+ //TODO - RF M3 workaround for https://jira.jboss.org/browse/RF-9025 / https://issues.apache.org/jira/browse/MYFACES-2888
+ LOGGER.warn("MyFaces implementation of JavaServer Faces detected. " +
+ "Wrapping of components using RichFaces behaviors (a4j:ajax etc.) won't work!");
+ }
+ } else {
+ LOGGER.warn("Cannot detect Mojarra vs MyFaces implementation of JavaServer Faces");
+ }
+ }
+
/*
* (non-Javadoc)
* @see javax.faces.view.facelets.TagHandlerDelegateFactory#createBehaviorHandlerDelegate(javax.faces.view.facelets.BehaviorHandler)
@@ -59,18 +86,13 @@
// TagHandlers structure is created when view is compiled
// so there's no need to check for BehaviorsStack
- ComponentHandler wrappedHandler = owner;
+ ComponentHandler handler = owner;
- //TODO - consider re-wrapping by smb. other, use attributes to handle
- if (wrappedHandler instanceof BehaviorsAddingComponentHandlerWrapper) {
- //MyFaces calls delegate factory just in ComponentHandler class ctor, so this is to avoid infinite recursion
- //our delegate is fine with null value
- return null;
- } else {
- wrappedHandler = new BehaviorsAddingComponentHandlerWrapper(owner);
+ if (!isMyFaces) {
+ handler = new BehaviorsAddingComponentHandlerWrapper(owner);
}
- return factory.createComponentHandlerDelegate(wrappedHandler);
+ return factory.createComponentHandlerDelegate(handler);
}
/*
Modified: branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -30,7 +30,7 @@
import org.ajax4jsf.component.behavior.ClientBehavior;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Anton Belevich
Modified: branches/RFPL-434/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/log.js
===================================================================
--- branches/RFPL-434/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/log.js 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/log.js 2010-08-25 19:14:48 UTC (rev 18973)
@@ -171,8 +171,7 @@
init: function(options) {
this.$super.constructor.call(this, 'richfaces.log');
this.attachToDom();
- this.__initialLogImpl = richfaces.log;
- richfaces.log = this;
+ richfaces.setLog(this);
this.level = options.level;
this.hotkey = options.hotkey;
@@ -187,8 +186,7 @@
},
destroy: function() {
- richfaces.log = this.__initialLogImpl;
- this.__initialLogImpl = null;
+ richfaces.setLog(null);
//TODO test this method
if (this.__popupWindow) {
Modified: branches/RFPL-434/ui/core/ui/src/test/java/org/richfaces/view/facelets/html/AttachQueueHandlerTest.java
===================================================================
--- branches/RFPL-434/ui/core/ui/src/test/java/org/richfaces/view/facelets/html/AttachQueueHandlerTest.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/core/ui/src/test/java/org/richfaces/view/facelets/html/AttachQueueHandlerTest.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -38,6 +38,7 @@
import javax.faces.view.ViewDeclarationLanguage;
import org.ajax4jsf.component.behavior.AjaxBehavior;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.jboss.test.faces.FacesEnvironment;
import org.jboss.test.faces.FacesEnvironment.FacesRequest;
import org.junit.After;
@@ -122,7 +123,7 @@
UIComponent attachQueue = viewRoot.findComponent(attachQueueId);
assertTrue(attachQueue instanceof AbstractAttachQueue);
- assertNull(attachQueue.getParent().getAttributes().get(AbstractAttachQueue.QUEUE_ID_ATTRIBUTE));
+ assertNull(attachQueue.getParent().getAttributes().get(AjaxRendererUtils.QUEUE_ID_ATTRIBUTE));
}
@Test
@@ -146,7 +147,7 @@
buildView("/attachQueueWithParentComponent.xhtml");
UIComponent link = viewRoot.findComponent(":form:link");
- assertEquals("form:attachQueue", link.getAttributes().get(AbstractAttachQueue.QUEUE_ID_ATTRIBUTE));
+ assertEquals("form:attachQueue", link.getAttributes().get(AjaxRendererUtils.QUEUE_ID_ATTRIBUTE));
}
@Test
Modified: branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -57,6 +57,9 @@
@Attribute(defaultValue="false")
public abstract boolean isShowControls();
+ @Attribute(defaultValue="100%")
+ public abstract String getInputWidth();
+
@Attribute
public abstract String getTabIndex();
}
Modified: branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -88,6 +88,11 @@
utils.addToScriptHash(options, "onerror", attributes.get("onerror"));
utils.addToScriptHash(options, "onbeforedomupdate", attributes.get("onbeforedomupdate"));
utils.addToScriptHash(options, "onchange", attributes.get("onchange"));
+ if (attributes.get("mode").equals("ajax")){
+ utils.addToScriptHash(options, "isCachedAjax", false, "true");
+ } else if (attributes.get("mode").equals("client")) {
+ utils.addToScriptHash(options, "ajaxMode", false, "true");
+ }
StringBuilder builder = new StringBuilder();
builder.append(ScriptUtils.toScript(options));
return builder.toString();
@@ -201,23 +206,28 @@
protected void encodeItemsContainer(FacesContext facesContext, UIComponent component) throws IOException {
AutocompleteEncodeStrategy strategy = getStrategy(component);
strategy.encodeItemsContainerBegin(facesContext, component);
- strategy.encodeFakeItem(facesContext, component);
+ if (component.getAttributes().get("mode").equals("client")) {
+ List<Object> fetchValues = new ArrayList<Object>();
+ this.encodeItems(facesContext, component, fetchValues);
+ } else {
+ strategy.encodeFakeItem(facesContext, component);
+ }
strategy.encodeItemsContainerEnd(facesContext, component);
}
private AutocompleteEncodeStrategy getStrategy(UIComponent component) {
AbstractAutocomplete comboBox = (AbstractAutocomplete) component;
if (comboBox.getLayout() != null) {
- if (comboBox.getLayout().equals(AutocompleteLayout.div)) {
+ if (comboBox.getLayout().equals(AutocompleteLayout.div.toString())) {
return new AutocompleteDivLayoutStrategy();
}
- if (comboBox.getLayout().equals(AutocompleteLayout.grid)) {
+ if (comboBox.getLayout().equals(AutocompleteLayout.grid.toString())) {
return new AutocompleteGridLayoutStrategy();
}
- if (comboBox.getLayout().equals(AutocompleteLayout.list)) {
+ if (comboBox.getLayout().equals(AutocompleteLayout.list.toString())) {
return new AutocompleteListLayoutStrategy();
}
- if (comboBox.getLayout().equals(AutocompleteLayout.table)) {
+ if (comboBox.getLayout().equals(AutocompleteLayout.table.toString())) {
return new AutocompleteTableLayoutStrategy();
}
}
@@ -226,12 +236,21 @@
@Override
protected void doDecode(FacesContext context, UIComponent component) {
- if (InputUtils.isDisabled(component)) {
+ AbstractAutocomplete autocomplete = (AbstractAutocomplete)component;
+ if (InputUtils.isDisabled(autocomplete)) {
return;
}
+ Map<String, String> requestParameters = context.getExternalContext().getRequestParameterMap();
+ Object value = requestParameters.get(component.getClientId(context) + "Value");
+ if (value != null) {
+ if(autocomplete.getConverter() != null){
+ value = autocomplete.getConverter().getAsObject(context, component, value.toString());
+ }
+ autocomplete.setSubmittedValue(value);
+ }
super.doDecode(context, component);
- Map<String, String> requestParameters = context.getExternalContext().getRequestParameterMap();
+
if (requestParameters.get(component.getClientId(context) + ".ajax") != null) {
PartialViewContext pvc = context.getPartialViewContext();
pvc.getRenderIds().add(
Modified: branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -46,6 +46,7 @@
@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-event.js"),
+ @ResourceDependency(name = "richfaces-base-component.js"),
@ResourceDependency(library="org.richfaces", name = "inplaceInput.js"),
@ResourceDependency(library="org.richfaces", name = "inplaceInput.ecss") })
public class InplaceInputBaseRenderer extends RendererBase {
Modified: branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -21,8 +21,10 @@
*/
package org.richfaces.view.facelets;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
import javax.faces.view.facelets.ComponentConfig;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.FaceletContext;
@@ -39,31 +41,44 @@
* @author Nick Belaevski
*
*/
-// TODO nick - this should be generated by CDK
+//TODO nick - this should be generated by CDK
public class AutocompleteHandler extends ComponentHandler {
private static final MetaRule AUTOCOMPLETE_METHOD_META_RULE = new MetaRule() {
@Override
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
+ public Metadata applyRule(String name, TagAttribute attribute,
+ MetadataTarget meta) {
if (meta.isTargetInstanceOf(AbstractAutocomplete.class)) {
if ("autocompleteMethod".equals(name)) {
- return new MethodMetadata(attribute, FacesContext.class, UIComponent.class, String.class) {
+ return new MethodMetadata(attribute, FacesContext.class,
+ UIComponent.class, String.class) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((AbstractAutocomplete) instance).setAutocompleteMethod(getMethodExpression(ctx));
}
};
}
- /*
- * if ("converter".equals(name)) { return new ConverterMetadata(attribute) { public void
- * applyMetadata(FaceletContext ctx, Object instance) { ((AbstractComboBox)
- * instance).setConverter((Converter) this.getAttr() .getObject(ctx, Converter.class)); } }; }
- */
- /*
- * if ("itemConverter".equals(name)) { return new ConverterMetadata(attribute) { public void
- * applyMetadata(FaceletContext ctx, Object instance) { ((AbstractComboBox)
- * instance).setItemConverter((Converter) this.getAttr() .getObject(ctx, Converter.class)); } }; }
- */
+
+ if ("converter".equals(name)) {
+ return new ConverterMetadata(attribute) {
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((AbstractAutocomplete) instance).setConverter(this.getConverter(ctx,
+ (AbstractAutocomplete) instance,
+ this.getAttr().getValueExpression(ctx, Converter.class)));
+ }
+ };
+ }
+
+ if ("itemConverter".equals(name)) {
+ return new ConverterMetadata(attribute) {
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((AbstractAutocomplete) instance).setItemConverter(this.getConverter(ctx,
+ (AbstractAutocomplete) instance,
+ this.getAttr().getValueExpression(ctx, Converter.class)));
+ }
+ };
+ }
+
}
return null;
@@ -71,7 +86,7 @@
};
public AutocompleteHandler(ComponentConfig config) {
- super(config);
+ super(config);
}
@Override
@@ -93,5 +108,38 @@
return attr;
}
+ public Converter getConverter(FaceletContext ctx,
+ AbstractAutocomplete component, ValueExpression converter) {
+ ValueExpression ve = null;
+ Converter c = null;
+ if (converter != null) {
+ ve = converter;
+ try {
+ c = (Converter) ve.getValue(ctx);
+ } catch (Exception e) {
+ // ok
+ }
+
+ }
+ if (c == null) {
+ c = this.createConverter(ctx, component);
+ }
+ if (c == null) {
+ // throw new TagException(this.getTag(), "No Converter was
+ // created");
+ }
+ return c;
+ }
+
+ private String getConverterId(FaceletContext ctx) {
+ return this.getAttr().getValue(ctx);
+ }
+
+ private Converter createConverter(FaceletContext ctx,
+ AbstractAutocomplete component) {
+ return ctx.getFacesContext().getApplication().createConverter(
+ getConverterId(ctx));
+ }
+
}
}
Modified: branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.js 2010-08-25 19:14:48 UTC (rev 18973)
@@ -2,13 +2,14 @@
rf.utils = rf.utils || {};
rf.utils.Cache = function (key, items, values) {
- this.key = key;
+ this.key = key.toLowerCase();
this.cache = {}
this.cache[this.key] = items || [];
this.values = typeof values != "function" ? values || this.cache[this.key] : values(items);
};
var getItems = function (key) {
+ key = key.toLowerCase();
var newCache = [];
if (key.length < this.key.length) {
@@ -21,7 +22,7 @@
var itemsCache = this.cache[this.key];
for (var i = 0; i<this.values.length; i++) {
var value = this.values[i].toLowerCase();
- var p = value.indexOf(key.toLowerCase());
+ var p = value.indexOf(key);
if (p == 0) {
newCache.push(itemsCache[i]);
}
@@ -43,7 +44,8 @@
};
var isCached = function (key) {
- return this.cache[key];
+ key = key.toLowerCase();
+ return this.cache[key] || this.key.indexOf(key)==0;
};
$.extend(rf.utils.Cache.prototype, (function () {
@@ -87,11 +89,13 @@
var $super = rf.ui.Autocomplete.$super;
var defaultOptions = {
- selectedItemClass:'rf-au-s',
+ selectedItemClass:'rf-au-select',
+ itemClass:'rf-au-option',
autofill:true,
minChars:1,
selectFirst:true,
ajaxMode:true,
+ isCachedAjax:true,
tokens: ",",
attachToBody:true
};
@@ -129,7 +133,7 @@
};
var onMouseAction = function(event) {
- var element = $(event.target).closest(".rf-au-i", event.currentTarget).get(0);
+ var element = $(event.target).closest("."+this.options.itemClass, event.currentTarget).get(0);
if (element) {
if (event.type=="mouseover") {
@@ -146,7 +150,7 @@
};
var updateItemsList = function (value, fetchValues) {
- this.items = $(rf.getDomElement(this.id+ID.ITEMS)).find(".rf-au-i");
+ this.items = $(rf.getDomElement(this.id+ID.ITEMS)).find("."+this.options.itemClass);
if (this.items.length>0) {
this.cache = new rf.utils.Cache(value, this.items, fetchValues || getData);
}
@@ -181,6 +185,7 @@
var callAjax = function(event, value) {
$(rf.getDomElement(this.id+ID.ITEMS)).removeData().empty();
+
rf.getDomElement(this.id+ID.VALUE).value = value;
var _this = this;
@@ -235,44 +240,39 @@
!noAutoFill && autoFill.call(this, this.value, getSelectedItemValue.call(this));
};
+ var updateItemsFromCache = function (value) {
+ var newItems = this.cache.getItems(value);
+ this.items = $(newItems);
+ //TODO: works only with simple markup, not with <tr>
+ $(rf.getDomElement(this.id+ID.ITEMS)).empty().append(newItems);
+ }
+
var onChangeValue = function (event, value) {
- //if(this.options.onchange){
- //this.options.onchange.call(this, event);
- //}
selectItem.call(this);
// value is undefined if called from AutocompleteBase onChange
var subValue = (typeof value == "undefined") ? this.__getSubValue() : value;
- // TODO: ajax call here if needed
- if ((!this.cache || subValue.length==0 || subValue.toLowerCase().indexOf(this.cache.key.toLowerCase())!=0) &&
- subValue.length>=this.options.minChars) {
+ if (this.cache && this.cache.isCached(subValue)) {
+ updateItemsFromCache.call(this, subValue);
+ this.index = -1;
this.value = subValue;
- this.options.ajaxMode && callAjax.call(this, event, subValue);
- return;
- }
- if(!this.cache){
- return;
- }
- var newItems = this.cache.getItems(subValue);
- this.items = $(newItems);
- //TODO: works only with simple markup, not with <tr>
- $(rf.getDomElement(this.id+ID.ITEMS)).empty().append(newItems);
- this.index = -1;
- this.value = subValue;
- if (subValue.length<this.options.minChars){
- this.hide();
- }
- if (this.options.selectFirst) {
- if (event.which == rf.KEYS.RETURN || event.type == "click") {
- this.setInputValue(subValue);
- return;
- } else {
- selectItem.call(this, 0, false, event.which == rf.KEYS.BACKSPACE || event.which == rf.KEYS.LEFT || event.which == rf.KEYS.RIGHT);
- return;
+ if (this.options.selectFirst) {
+ if (event.which == rf.KEYS.RETURN || event.type == "click") {
+ this.setInputValue(subValue);
+ } else {
+ selectItem.call(this, 0, false, event.which == rf.KEYS.BACKSPACE || event.which == rf.KEYS.LEFT || event.which == rf.KEYS.RIGHT);
+ }
}
+ } else {
+ if (subValue.length>=this.options.minChars) {
+ if (this.options.ajaxMode && this.value!=subValue) {
+ this.value = subValue;
+ this.options.ajaxMode && callAjax.call(this, event, subValue);
+ }
+ }
}
- this.setInputValue(subValue);
+
};
var getSelectedItemValue = function () {
@@ -342,8 +342,8 @@
__updateState: function (event) {
var subValue = this.__getSubValue();
// called from onShow method, not actually value changed
- if (this.items.length==0 && this.isFirstAjax) {
- callAjax.call(this, event, subValue);
+ if (this.items.length==0 && subValue.length>=this.options.minChars && this.isFirstAjax) {
+ this.options.ajaxMode && callAjax.call(this, event, subValue);
}
return;
},
@@ -380,13 +380,11 @@
//rf.getDomElement(this.fieldId).focus();
},
__onShow: function (event) {
- if (event.which != rf.KEYS.BACKSPACE) {
- if(this.items && this.items.length>0){
- if (this.index!=0 && this.options.selectFirst) {
- selectItem.call(this, 0);
- }
+ if (event.which != rf.KEYS.BACKSPACE && this.items && this.items.length>0) {
+ if (this.index!=0 && this.options.selectFirst) {
+ selectItem.call(this, 0);
}
- }
+ }
},
__onHide: function () {
selectItem.call(this);
Modified: branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/AutocompleteBase.js 2010-08-25 19:14:48 UTC (rev 18973)
@@ -15,7 +15,7 @@
return elements;
},
unbindScrollEventHandlers: function(elements, component) {
- RichFaces.Event.unbind(elements, component.getNamespace());
+ RichFaces.Event.unbind(elements, "scroll"+component.getNamespace());
}
});
@@ -65,7 +65,7 @@
var inputEventHandlers = {};
- if (this.options.buttonId && !this.options.disabled) {
+ if (this.options.buttonId) {
inputEventHandlers["mousedown"+this.namespace] = onButtonShow;
inputEventHandlers["mouseup"+this.namespace] = onSelectMouseUp;
rf.Event.bindById(this.options.buttonId, inputEventHandlers, this);
@@ -133,10 +133,10 @@
}
if (flag) {
this.currentValue = this.getInputValue();
- if(value && value.length>=this.options.minChars){
+ /*if(value && value.length>=this.options.minChars){
onShow.call(this, event);
- }
-
+ }*/ // TODO: AMarkhel: is this check needed??? for what?
+ onShow.call(this, event);
}
}
};
@@ -199,7 +199,7 @@
/*
* public API functions definition
*/
- var show = function (event, showButtonPressed) {
+ var show = function (event) {
if (!this.isVisible) {
if (this.__onBeforeShow(event)!=false) {
this.scrollElements = rf.Event.bindScrollEventHandlers(this.selectId, this.hide, this, this.namespace);
@@ -210,7 +210,7 @@
}
$(rf.getDomElement(this.selectId)).setPosition({id: this.fieldId}, {type:"DROPDOWN", offset:[0,20]}).show();
this.isVisible = true;
- this.__onShow(event, showButtonPressed);
+ this.__onShow(event);
}
}
};
Modified: branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-08-25 19:14:48 UTC (rev 18973)
@@ -170,9 +170,9 @@
}
.rf-ii-none {
- clip:rect(0px, 0px, 1px, 1px);
+ clip: "rect(0px 0px 1px 1px)";
}
.rf-ii-none {
- clip:rect(0px 0px 1px 1px);
+ clip: rect(0px, 0px, 1px, 1px);
}
Modified: branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-08-25 19:14:48 UTC (rev 18973)
@@ -1,8 +1,35 @@
-(function ($, richfaces) {
+// TODO: remove when these functions will be moved to the RichFaces.Event
+$.extend(RichFaces.Event, {
+ bindScrollEventHandlers: function(element, handler, component) {
+ var elements = [];
+ element = RichFaces.getDomElement(element).parentNode;
+ while (element && element!=window.document.body)
+ {
+ if (element.offsetWidth!=element.scrollWidth || element.offsetHeight!=element.scrollHeight)
+ {
+ elements.push(element);
+ RichFaces.Event.bind(element, "scroll"+component.getNamespace(), handler, component);
+ }
+ element = element.parentNode;
+ }
+ return elements;
+ },
+ unbindScrollEventHandlers: function(elements, component) {
+ RichFaces.Event.unbind(elements, "scroll"+component.getNamespace());
+ }
+});
+
+(function ($, rf) {
- richfaces.ui = richfaces.ui || {};
+ rf.ui = rf.ui || {};
- richfaces.ui.InplaceInput = function(id, options) {
+ rf.ui.InplaceInput = function(id, options) {
+ /*TODO: use defaultOptions*/
+ $super.constructor.call(this, id);
+ this.attachToDom(id);
+
+ this.namespace = this.namespace || "."+rf.Event.createNamespace(this.name, this.id);
+
this.currentState = options.state;
this.editEvent = options.editEvent;
this.noneCss = options.noneCss;
@@ -17,11 +44,9 @@
this.element.bind(this.editEvent, $.proxy(this.__editHandler, this));
this.input.bind("focus", $.proxy(this.__editHandler, this));
-
- if(!this.showControls) {
- this.input.bind("change", $.proxy(this.__saveHandler, this));
- this.input.bind("blur", $.proxy(this.__saveHandler, this));
- }
+ this.input.bind("change", $.proxy(this.__changeHandler, this));
+ this.input.bind("blur", $.proxy(this.__blurHandler, this));
+ this.input.bind("keydown", $.proxy(this.__keydownHandler, this));
if(this.showControls) {
this.okbtn = $(document.getElementById(options.okbtn));
@@ -30,46 +55,52 @@
this.cancelbtn.bind("mousedown", $.proxy(this.__cancelBtnHandler, this));
}
};
-
- $.extend(richfaces.ui.InplaceInput, {
- READY : "ready",
- EDIT : "edit",
- CHANGED : "changed"
- });
- $.extend(richfaces.ui.InplaceInput.prototype, ( function () {
- return {
- name : "RichFaces.ui.InplaceInput",
+ // Extend component class and add protected methods from parent class to our container
+ rf.BaseComponent.extend( rf.ui.InplaceInput);
+
+ // define super class link
+ var $super = rf.ui.InplaceInput.$super;
+ $.extend(rf.ui.InplaceInput.prototype, ( function () {
+
+ var isSaved = false;
+
+ return {
+ name : "inplaceInput",
+
/****************** public methods *****************************************/
+ getNamespace: function () {
+ return this.namespace;
+ },
+
edit: function() {
- this.editContainer.removeClass(this.noneCss);
+ isSaved = false;
+ this.__show();
this.input.focus();
},
save: function() {
-
- var inputValue = this.input.val();
- if(inputValue.length > 0) {
- this.label.text(inputValue);
- }
+ var inputValue = this.input.val();
+ if(inputValue.length > 0) {
+ this.label.text(inputValue);
+ }
- if(inputValue != this.initialValue) {
- this.element.addClass(this.changedCss);
- } else {
- this.element.removeClass(this.changedCss);
- }
-
- if(!this.showControls) {
- this.editContainer.addClass(this.noneCss);
- }
+ if(inputValue != this.initialValue) {
+ this.element.addClass(this.changedCss);
+ } else {
+ this.element.removeClass(this.changedCss);
+ }
+ isSaved = true;
+ this.__hide();
},
cancel: function() {
var text = this.label.text();
this.input.val(text);
- this.editContainer.addClass(this.noneCss);
+ isSaved = true;
+ this.__hide();
},
setValue: function (value) {
@@ -84,15 +115,12 @@
/****************** private methods *****************************************/
__saveBtnHandler: function(e) {
- this.input.blur();
this.save();
- this.editContainer.addClass(this.noneCss);
return false;
},
__cancelBtnHandler: function(e) {
- this.cancel();
- this.input.blur();
+ this.cancel();
return false;
},
@@ -102,9 +130,52 @@
this.input.bind("focus", $.proxy(this.__editHandler, this));
},
- __saveHandler: function(e) {
- this.save();
- }
+ __changeHandler: function(e) {
+ if(!isSaved) {
+ this.save();
+ }
+ },
+
+ __blurHandler: function(e) {
+ if(!isSaved) {
+ this.save();
+ }
+ },
+
+ __scrollHandler: function(e) {
+ this.cancel();
+ },
+
+ __keydownHandler: function(e) {
+ switch(e.keyCode) {
+ /*Esc*/
+ case 27:
+ this.cancel();
+ break;
+ /*Enter*/
+ case 13:
+ this.save();
+ return false;
+ }
+
+ },
+
+ __show: function() {
+ this.scrollElements = rf.Event.bindScrollEventHandlers(this.id, this.__scrollHandler, this);
+ this.editContainer.removeClass(this.noneCss);
+ },
+
+ __hide: function() {
+ rf.Event.unbindScrollEventHandlers(this.scrollElements, this);
+ this.scrollElements = null;
+ this.editContainer.addClass(this.noneCss);
+ this.input.blur();
+ },
+
+ destroy: function () {
+ //TODO: unbind handlers
+ $super.destroy.call(this);
+ }
}
})());
Modified: branches/RFPL-434/ui/input/ui/src/main/templates/autocomplete.template.xml
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/templates/autocomplete.template.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/templates/autocomplete.template.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -15,8 +15,8 @@
<cc:implementation>
<cdk:object type="java.lang.Object" name="disabled" value="#{component.attributes['disabled']}" />
- <div id="#{clientId}" class="rf-au-f-w rf-au-f">
- <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="rf-au-ft rf-au-i" />
+ <div id="#{clientId}" class="rf-au-field-width rf-au-field">
+ <input id="#{clientId}Value" name="#{clientId}Value" type="hidden" class="rf-au-font rf-au-input" />
<div style="position : relative; overflow : hidden; text-align : left; padding-right : 21px;">
<input onclick="#{component.attributes['onclick']}"
ondblclick="#{component.attributes['ondblclick']}"
@@ -29,16 +29,16 @@
onmouseout="#{component.attributes['onmouseout']}"
onkeyup="#{component.attributes['onkeyup']}"
onkeydown="#{component.attributes['onkeydown']}"
- onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" disabled="#{disabled}" name="#{clientId}" type="text" class="rf-au-ft rf-au-i" />
+ onkeypress="#{component.attributes['onkeypress']}" id="#{clientId}Input" value="#{component.attributes['value']}" disabled="#{disabled}" name="#{clientId}" type="text" class="rf-au-font rf-au-input" />
<c:if test="#{component.attributes['showButton']}">
<c:if test="#{component.attributes['disabled']}">
- <div id="#{clientId}Button" class="rf-au-b">
- <div class="rf-au-b-a"></div>
+ <div id="#{clientId}Button" class="rf-au-button">
+ <div class="rf-au-button-arrow"></div>
</div>
</c:if>
<c:if test="#{!component.attributes['disabled']}">
- <div id="#{clientId}Button" class="rf-au-b">
- <div class="rf-au-b-a"></div>
+ <div id="#{clientId}Button" class="rf-au-button">
+ <div class="rf-au-button-arrow"></div>
</div>
</c:if>
</c:if>
@@ -56,16 +56,16 @@
onkeyup="#{component.attributes['onlistkeyup']}"
onkeydown="#{component.attributes['onlistkeydown']}"
onkeypress="#{component.attributes['onlistkeypress']}"
- id="#{clientId}List" class="rf-au-l-c">
+ id="#{clientId}List" class="rf-au-list-cord">
- <div class="rf-au-shw">
- <div class="rf-au-shw-t"></div>
- <div class="rf-au-shw-l"></div>
- <div class="rf-au-shw-r"></div>
- <div class="rf-au-shw-b"></div>
+ <div class="rf-au-shadow">
+ <div class="rf-au-shadow-t"></div>
+ <div class="rf-au-shadow-l"></div>
+ <div class="rf-au-shadow-r"></div>
+ <div class="rf-au-shadow-b"></div>
- <div class="rf-au-l-d">
- <div class="rf-au-l-s rf-au-l-w rf-au-l-h">
+ <div class="rf-au-list-decoration">
+ <div class="rf-au-list-scroll rf-au-list-width rf-au-list-height">
<cdk:body>
<cdk:call expression="encodeItemsContainer(facesContext, component)"/>
</cdk:body>
Modified: branches/RFPL-434/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -24,7 +24,7 @@
#{inplaceValue}
</span>
<span id="#{clientId}:edit" class="#{getEditStyleClass(component, inplaceState)}">
- <input id="#{clientId}:input" autocomplete="off" name="#{clientId}:input" type="text" value="#{inplaceValue}" class="rf-ii-f" cdk:passThrough="tabIndex"/>
+ <input id="#{clientId}:input" autocomplete="off" name="#{clientId}:input" type="text" value="#{inplaceValue}" class="rf-ii-f" cdk:passThrough="tabIndex" style="width: #{component.attributes['inputWidth']};" />
<c:if test="#{component.attributes['showControls']}">
<span class="rf-ii-btn-prepos">
Modified: branches/RFPL-434/ui/input/ui/src/main/templates/input.template.inc
===================================================================
--- branches/RFPL-434/ui/input/ui/src/main/templates/input.template.inc 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/main/templates/input.template.inc 2010-08-25 19:14:48 UTC (rev 18973)
@@ -23,7 +23,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<span class="rf-ins-ci">
- <input xmlns:cdk="http://richfaces.org/cdk/core" name="#{clientId}" type="text"
+ <input xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" name="#{clientId}" type="text"
class="rf-ins-i #{component.attributes['inputClass']}" value="#{getInputValue(facesContext, component)}"
cdk:passThrough="accesskey disabled maxlength size:inputSize tabindex" readonly="#{!component.attributes['enableManualInput']}"
style="#{component.attributes['showInput'] ? null : 'display: none;'}" />
Modified: branches/RFPL-434/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
===================================================================
--- branches/RFPL-434/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -49,7 +49,6 @@
@Before
public void setUp() {
environment = new HtmlUnitEnvironment();
-
environment.withWebRoot(new File("src/test/resources"));
environment.withResource("/WEB-INF/faces-config.xml", "org/richfaces/renderkit/faces-config.xml");
environment.withResource("/test.xhtml", "org/richfaces/renderkit/rendererTest.xhtml");
@@ -137,7 +136,10 @@
@Test
public void testEdit() throws Exception {
HtmlPage page = environment.getPage("/test.jsf");
- edit(page, "input_default");
+ edit(page, "input_default", "Another Test String");
+
+ blur(page);
+
List<?> labelNodes = page.getByXPath("//*[@id = 'form:input_default:label']/text()");
assertEquals(1, labelNodes.size());
DomText text = (DomText) labelNodes.get(0);
@@ -150,7 +152,22 @@
}
- private void edit(HtmlPage page, String inplaceInputId) throws Exception {
+ private void blur(HtmlPage page) throws Exception {
+ List<?> panelNodes = page.getByXPath("//*[@id = 'form:panel']");
+ assertEquals(1, panelNodes.size());
+ HtmlElement panel = (HtmlElement) panelNodes.get(0);
+ panel.click();
+ }
+
+ private void typeNewValue(HtmlPage page, String inplaceInputId, String value) throws Exception {
+ List<?> inputNodes = page.getByXPath("//*[@id = 'form:" + inplaceInputId + ":input']");
+ assertEquals(1, inputNodes.size());
+ HtmlElement input = (HtmlElement) inputNodes.get(0);
+ input.setAttribute(HTML.VALUE_ATTRIBUTE, "");
+ input.type(value);
+ }
+
+ private void edit(HtmlPage page, String inplaceInputId, String value) throws Exception {
List<?> nodes = page.getByXPath("//*[@id = 'form:" + inplaceInputId + "']");
assertEquals(1, nodes.size());
HtmlElement span = (HtmlElement) nodes.get(0);
@@ -160,29 +177,20 @@
assertEquals(1, editNodes.size());
HtmlElement edit = (HtmlElement) editNodes.get(0);
assertEquals("rf-ii-e-s", edit.getAttribute(HTML.CLASS_ATTRIBUTE));
-
- List<?> inputNodes = page.getByXPath("//*[@id = 'form:" + inplaceInputId + ":input']");
- assertEquals(1, inputNodes.size());
- HtmlElement input = (HtmlElement) inputNodes.get(0);
- input.setAttribute(HTML.VALUE_ATTRIBUTE, "");
- input.type("Another Test String");
-
- List<?> panelNodes = page.getByXPath("//*[@id = 'form:panel']");
- assertEquals(1, panelNodes.size());
- HtmlElement panel = (HtmlElement) panelNodes.get(0);
- panel.click();
+
+ typeNewValue(page, inplaceInputId, value);
}
@Test
public void testEditWithControls() throws Exception {
HtmlPage page = environment.getPage("/test.jsf");
- edit(page, "input_controls");
+ edit(page, "input_controls", "Another Test String");
List<?> cancelNodes = page.getByXPath("//*[@id = 'form:input_controls:cancelbtn']");
assertEquals(1, cancelNodes.size());
HtmlElement cancel = (HtmlElement) cancelNodes.get(0);
-
+
cancel.mouseDown();
List<?> labelNodes = page.getByXPath("//*[@id = 'form:input_controls:label']/text()");
@@ -195,7 +203,7 @@
HtmlElement span = (HtmlElement) nodes.get(0);
assertEquals("rf-ii-d-s", span.getAttribute(HTML.CLASS_ATTRIBUTE));
- edit(page, "input_controls");
+ edit(page, "input_controls", "Another Test String");
List<?> okNodes = page.getByXPath("//*[@id = 'form:input_controls:okbtn']");
assertEquals(1, okNodes.size());
@@ -212,6 +220,15 @@
assertEquals(1, nodes.size());
span = (HtmlElement) nodes.get(0);
assertEquals("rf-ii-d-s rf-ii-c-s", span.getAttribute(HTML.CLASS_ATTRIBUTE));
+
+ edit(page, "input_controls", "Test String");
+
+ blur(page);
+
+ labelNodes = page.getByXPath("//*[@id = 'form:input_controls:label']/text()");
+ assertEquals(1, labelNodes.size());
+ text = (DomText) labelNodes.get(0);
+ assertEquals("Test String", text.getTextContent());
}
@After
Modified: branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
===================================================================
--- branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -44,7 +44,7 @@
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.log.RichfacesLogger;
import org.richfaces.renderkit.MetaComponentRenderer;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
* @author Anton Belevich
Modified: branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -40,7 +40,7 @@
import org.richfaces.context.ExtendedVisitContext;
import org.richfaces.context.ExtendedVisitContextMode;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
/**
Modified: branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
===================================================================
--- branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -60,7 +60,7 @@
import org.richfaces.model.SortField;
import org.richfaces.model.SortMode;
import org.richfaces.renderkit.MetaComponentRenderer;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
public abstract class UIDataTableBase extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder {
Modified: branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java
===================================================================
--- branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-25 19:14:48 UTC (rev 18973)
@@ -41,7 +41,7 @@
import org.richfaces.component.UIDataAdaptor;
import org.richfaces.component.util.MessageUtil;
import org.richfaces.log.RichfacesLogger;
-import org.slf4j.Logger;
+import org.richfaces.log.Logger;
public class DataTablePreRenderListener implements SystemEventListener {
Modified: branches/RFPL-434/ui/parent/pom.xml
===================================================================
--- branches/RFPL-434/ui/parent/pom.xml 2010-08-25 18:43:39 UTC (rev 18972)
+++ branches/RFPL-434/ui/parent/pom.xml 2010-08-25 19:14:48 UTC (rev 18973)
@@ -129,12 +129,6 @@
<!-- tests -->
<dependency>
- <!-- todo api? -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test-jsf</groupId>
<artifactId>jsf-test-stage</artifactId>
<scope>test</scope>
More information about the richfaces-svn-commits
mailing list