[richfaces-svn-commits] JBoss Rich Faces SVN: r2491 - in trunk: framework/impl/src/main/java/org/ajax4jsf/component and 28 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Aug 24 19:22:01 EDT 2007
Author: alexsmirnov
Date: 2007-08-24 19:22:01 -0400 (Fri, 24 Aug 2007)
New Revision: 2491
Added:
trunk/sandbox/ui/state/
trunk/sandbox/ui/state/pom.xml
trunk/sandbox/ui/state/src/
trunk/sandbox/ui/state/src/main/
trunk/sandbox/ui/state/src/main/config/
trunk/sandbox/ui/state/src/main/config/component/
trunk/sandbox/ui/state/src/main/config/component/state.xml
trunk/sandbox/ui/state/src/main/config/component/states.xml
trunk/sandbox/ui/state/src/main/java/
trunk/sandbox/ui/state/src/main/java/org/
trunk/sandbox/ui/state/src/main/java/org/richfaces/
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StatePropertyResolver.java
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StateResolver.java
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIState.java
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIStates.java
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/
trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/State.java
trunk/sandbox/ui/state/src/main/resources/
trunk/sandbox/ui/state/src/main/templates/
trunk/sandbox/ui/state/src/main/templates/README
trunk/sandbox/ui/state/src/main/templates/org/
trunk/sandbox/ui/state/src/main/templates/org/richfaces/
trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/
trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlState.jspx
trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlStates.jspx
trunk/sandbox/ui/state/src/test/
trunk/sandbox/ui/state/src/test/java/
trunk/sandbox/ui/state/src/test/java/org/
trunk/sandbox/ui/state/src/test/java/org/richfaces/
trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/
trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/
trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/JSFComponentTest.java
trunk/ui/insert/src/main/java/org/richfaces/ui/component/DummyHighLight.java
trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java
trunk/ui/insert/src/main/java/org/richfaces/ui/component/HighlightImpl.java
Removed:
trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties
trunk/pom.xml
trunk/samples/pom.xml
trunk/sandbox/ui/pom.xml
trunk/ui/assembly/pom.xml
trunk/ui/insert/src/main/java/org/ajax4jsf/renderkit/AbstractInsertRenderer.java
Log:
Fix http://jira.jboss.com/jira/browse/RF-680
change default JSF version to 1.2_04-p02 for samples.
add 'state' component to sandbox
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -405,8 +405,8 @@
Object key = (Object) iter.next();
ajaxVisitor.process(context, key, null);
}
- setRowKey(savedKey);
- restoreOrigValue();
+ setRowKey(context,savedKey);
+ restoreOrigValue(context);
} else {
if(_log.isDebugEnabled()){
_log.debug("Component "+getClientId(context)+" children components for all rows");
Modified: trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties
===================================================================
--- trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/framework/impl/src/main/resources/org/ajax4jsf/messages.properties 2007-08-24 23:22:01 UTC (rev 2491)
@@ -250,5 +250,6 @@
AJAX_VIEW_EXPIRED=View state could't be restored - reload page ?
SKIN_CYCLIC_REFERENCE=Cyclic reference in Skin configuration for property \: {0}
SKIN_ILLEGAL_REFERENCE=Reference for property "{0}" not present in Skin configuration
-NULL_ATTRIBUTE_ERROR=Requied attribute {0} for component {1} is null
-UI_INSERT_RESOURCE_NOT_FOUND="Resource {1} not found, component {0}
\ No newline at end of file
+NULL_ATTRIBUTE_ERROR=Required attribute {0} for component {1} is null
+UI_INSERT_RESOURCE_NOT_FOUND="Resource {1} not found, component {0}
+HIGHLIGHT_LIBRARY_NOT_FOUND="In order to use highlight attribute of the rich:insert component, add jhighlight.jar from https://jhighlight.dev.java.net/ into application."
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/pom.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -38,7 +38,7 @@
<id>maven-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>
- https://maven-repository.dev.java.net/nonav/repository
+ http://download.java.net/maven/1
</url>
<layout>legacy</layout>
</repository>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/samples/pom.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -185,12 +185,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -240,12 +240,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -285,12 +285,12 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -339,13 +339,13 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
+ <version>1.2_04-p02</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/sandbox/ui/pom.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -1,18 +1,18 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>ui</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox</groupId>
- <packaging>pom</packaging>
- <artifactId>ui</artifactId>
- <name>Richfaces Sandbox UI</name>
- <modules>
- <module>panel2</module>
- <module>simpleTogglePanel2</module>
- </modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.sandbox</groupId>
+ <packaging>pom</packaging>
+ <artifactId>ui</artifactId>
+ <name>Richfaces Sandbox UI</name>
+ <modules>
+ <module>panel2</module>
+ <module>simpleTogglePanel2</module>
+ <module>state</module>
+ </modules>
</project>
\ No newline at end of file
Added: trunk/sandbox/ui/state/pom.xml
===================================================================
--- trunk/sandbox/ui/state/pom.xml (rev 0)
+++ trunk/sandbox/ui/state/pom.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces.sandbox</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>state</artifactId>
+ <name>state</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <library>
+ <prefix>org.richfaces.ui</prefix>
+ <taglib>
+ <shortName>state</shortName>
+ </taglib>
+ </library>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Property changes on: trunk/sandbox/ui/state/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/config/component/state.xml
===================================================================
--- trunk/sandbox/ui/state/src/main/config/component/state.xml (rev 0)
+++ trunk/sandbox/ui/state/src/main/config/component/state.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<components>
+ <component>
+ <name>org.richfaces.ui.State</name>
+ <family>org.richfaces.ui.State</family>
+ <classname>org.richfaces.ui.component.html.HtmlState</classname>
+ <superclass>org.richfaces.ui.component.UIState</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.ui.StateRenderer</name>
+ <template>org/richfaces/ui/htmlState.jspx</template>
+ </renderer>
+ <tag>
+ <name>state</name>
+ <classname>org.richfaces.ui.taglib.StateTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ </component>
+</components>
Property changes on: trunk/sandbox/ui/state/src/main/config/component/state.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/config/component/states.xml
===================================================================
--- trunk/sandbox/ui/state/src/main/config/component/states.xml (rev 0)
+++ trunk/sandbox/ui/state/src/main/config/component/states.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<components>
+ <component>
+ <name>org.richfaces.ui.States</name>
+ <family>org.richfaces.ui.States</family>
+ <classname>org.richfaces.ui.component.html.HtmlStates</classname>
+ <superclass>org.richfaces.ui.component.UIStates</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.ui.StatesRenderer</name>
+ <template>org/richfaces/ui/htmlStates.jspx</template>
+ </renderer>
+ <tag>
+ <name>states</name>
+ <classname>org.richfaces.ui.taglib.StatesTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ </component>
+</components>
Property changes on: trunk/sandbox/ui/state/src/main/config/component/states.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StatePropertyResolver.java
===================================================================
--- trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StatePropertyResolver.java (rev 0)
+++ trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StatePropertyResolver.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,96 @@
+/**
+ *
+ */
+package org.richfaces.ui.application;
+
+import javax.faces.el.EvaluationException;
+import javax.faces.el.PropertyNotFoundException;
+import javax.faces.el.PropertyResolver;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class StatePropertyResolver extends PropertyResolver {
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#getType(java.lang.Object, java.lang.Object)
+ */
+ @Override
+ public Class getType(Object arg0, Object arg1) throws EvaluationException,
+ PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#getType(java.lang.Object, int)
+ */
+ @Override
+ public Class getType(Object arg0, int arg1) throws EvaluationException,
+ PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#getValue(java.lang.Object, java.lang.Object)
+ */
+ @Override
+ public Object getValue(Object arg0, Object arg1)
+ throws EvaluationException, PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#getValue(java.lang.Object, int)
+ */
+ @Override
+ public Object getValue(Object arg0, int arg1) throws EvaluationException,
+ PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#isReadOnly(java.lang.Object, java.lang.Object)
+ */
+ @Override
+ public boolean isReadOnly(Object arg0, Object arg1)
+ throws EvaluationException, PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#isReadOnly(java.lang.Object, int)
+ */
+ @Override
+ public boolean isReadOnly(Object arg0, int arg1)
+ throws EvaluationException, PropertyNotFoundException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#setValue(java.lang.Object, java.lang.Object, java.lang.Object)
+ */
+ @Override
+ public void setValue(Object arg0, Object arg1, Object arg2)
+ throws EvaluationException, PropertyNotFoundException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.PropertyResolver#setValue(java.lang.Object, int, java.lang.Object)
+ */
+ @Override
+ public void setValue(Object arg0, int arg1, Object arg2)
+ throws EvaluationException, PropertyNotFoundException {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StatePropertyResolver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StateResolver.java
===================================================================
--- trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StateResolver.java (rev 0)
+++ trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StateResolver.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,26 @@
+/**
+ *
+ */
+package org.richfaces.ui.application;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.VariableResolver;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class StateResolver extends VariableResolver {
+
+ /* (non-Javadoc)
+ * @see javax.faces.el.VariableResolver#resolveVariable(javax.faces.context.FacesContext, java.lang.String)
+ */
+ @Override
+ public Object resolveVariable(FacesContext arg0, String arg1)
+ throws EvaluationException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Property changes on: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/application/StateResolver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIState.java
===================================================================
--- trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIState.java (rev 0)
+++ trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIState.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+
+package org.richfaces.ui.component;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UIState extends UIComponentBase {
+
+ private static final String COMPONENT_TYPE = "org.richfaces.ui.State";
+
+ private static final String COMPONENT_FAMILY = "org.richfaces.ui.State";
+
+}
Property changes on: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIState.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIStates.java
===================================================================
--- trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIStates.java (rev 0)
+++ trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIStates.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+
+package org.richfaces.ui.component;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UIStates extends UIComponentBase {
+
+ private static final String COMPONENT_TYPE = "org.richfaces.ui.States";
+
+ private static final String COMPONENT_FAMILY = "org.richfaces.ui.States";
+
+}
Property changes on: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/component/UIStates.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/State.java
===================================================================
--- trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/State.java (rev 0)
+++ trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/State.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.richfaces.ui.model;
+
+import javax.faces.el.MethodBinding;
+
+/**
+ * @author asmirnov
+ *
+ */
+public interface State {
+
+ public Object getProperty(String name);
+
+ public MethodBinding getAction(String name);
+
+ public String getNavigation(String outcome);
+
+}
Property changes on: trunk/sandbox/ui/state/src/main/java/org/richfaces/ui/model/State.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/sandbox/ui/state/src/main/templates/README
===================================================================
Added: trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlState.jspx
===================================================================
--- trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlState.jspx (rev 0)
+++ trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlState.jspx 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+ xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ class="org.richfaces.ui.renderkit.html.StateRenderer"
+ baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase"
+ component="org.richfaces.ui.component.UIState"
+ >
+ <f:clientid var="clientId"/>
+ <div id="#{clientId}"
+ x:passThruWithExclusions="value,name,type,id"
+ >
+ </div>
+</f:root>
\ No newline at end of file
Property changes on: trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlState.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlStates.jspx
===================================================================
--- trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlStates.jspx (rev 0)
+++ trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlStates.jspx 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+ xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ class="org.richfaces.ui.renderkit.html.StatesRenderer"
+ baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase"
+ component="org.richfaces.ui.component.UIStates"
+ >
+ <f:clientid var="clientId"/>
+ <div id="#{clientId}"
+ x:passThruWithExclusions="value,name,type,id"
+ >
+ </div>
+</f:root>
\ No newline at end of file
Property changes on: trunk/sandbox/ui/state/src/main/templates/org/richfaces/ui/htmlStates.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/JSFComponentTest.java
===================================================================
--- trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/JSFComponentTest.java (rev 0)
+++ trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/JSFComponentTest.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,53 @@
+/**
+ * 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.ui.component;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import javax.faces.component.UIComponent;
+
+/**
+ * Unit test for simple Component.
+ */
+public class JSFComponentTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public JSFComponentTest( String testName )
+ {
+ super( testName );
+ }
+
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testComponent()
+ {
+ assertTrue( true );
+ }
+}
Property changes on: trunk/sandbox/ui/state/src/test/java/org/richfaces/ui/component/JSFComponentTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/ui/assembly/pom.xml 2007-08-24 23:22:01 UTC (rev 2491)
@@ -139,7 +139,7 @@
en
</artifactId>
<version>
- 3.1.0-SNAPSHOT
+ ${project.version}
</version>
<type>war</type>
<classifier>pdf</classifier>
Modified: trunk/ui/insert/src/main/java/org/ajax4jsf/renderkit/AbstractInsertRenderer.java
===================================================================
--- trunk/ui/insert/src/main/java/org/ajax4jsf/renderkit/AbstractInsertRenderer.java 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/ui/insert/src/main/java/org/ajax4jsf/renderkit/AbstractInsertRenderer.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -17,14 +17,17 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.ui.component.DummyHighLight;
import org.richfaces.ui.component.Highlight;
+import org.richfaces.ui.component.HighlightImpl;
import org.richfaces.ui.component.UIInsert;
/**
* @author asmirnov
*
*/
-public abstract class AbstractInsertRenderer extends HeaderResourcesRendererBase {
+public abstract class AbstractInsertRenderer extends
+ HeaderResourcesRendererBase {
private static final Object ERROR_MESSAGE_CLASS = "dr-insert-error";
@@ -38,16 +41,14 @@
renderStream(context, component, inputStream);
} else {
String errorContent = component.getErrorContent();
- if( null != errorContent && null != (inputStream = externalContext.getResourceAsStream(errorContent))){
+ if (null != errorContent
+ && null != (inputStream = externalContext
+ .getResourceAsStream(errorContent))) {
// Render default content, if src not found.
renderStream(context, component, inputStream);
} else {
// Render error message for a not found resource.
- ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.SPAN_ELEM, component);
- writer.writeAttribute(HTML.class_ATTRIBUTE, ERROR_MESSAGE_CLASS, null);
- writer.write(Messages.getMessage("UI_INSERT_RESOURCE_NOT_FOUND", new Object[]{component.getClientId(context),component.getSrc()}));
- writer.endElement(HTML.SPAN_ELEM);
+ renderErrorMessage(context, component, "UI_INSERT_RESOURCE_NOT_FOUND");
}
}
} else {
@@ -61,6 +62,25 @@
/**
* @param context
* @param component
+ * @param message TODO
+ * @throws IOException
+ */
+ private void renderErrorMessage(FacesContext context, UIInsert component, String message)
+ throws IOException {
+ ResponseWriter writer = context.getResponseWriter();
+ writer.startElement(HTML.SPAN_ELEM, component);
+ writer.writeAttribute(HTML.class_ATTRIBUTE,
+ ERROR_MESSAGE_CLASS, null);
+ writer.write(Messages.getMessage(
+ message, new Object[] {
+ component.getClientId(context),
+ component.getSrc() }));
+ writer.endElement(HTML.SPAN_ELEM);
+ }
+
+ /**
+ * @param context
+ * @param component
* @param inputStream
* @throws UnsupportedEncodingException
* @throws FacesException
@@ -90,22 +110,22 @@
in.close();
}
} else {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ Highlight highlighter;
try {
- Highlight highlighter = new Highlight(component
- .getHighlight());
- highlighter.highlight(component.getSrc(), inputStream,
- out, encoding, true);
+ highlighter = new HighlightImpl(component.getHighlight());
+
+ } catch (NoClassDefFoundError e) {
+ renderErrorMessage(context, component, "HIGHLIGHT_LIBRARY_NOT_FOUND");
+ highlighter = new DummyHighLight();
+ }
+ try {
+ highlighter.highlight(component.getSrc(), inputStream, writer,
+ encoding);
} catch (IOException e) {
throw new FacesException(e);
} finally {
inputStream.close();
}
- if (null != encoding) {
- writer.write(out.toString(encoding));
- } else {
- writer.write(out.toString());
- }
}
}
Added: trunk/ui/insert/src/main/java/org/richfaces/ui/component/DummyHighLight.java
===================================================================
--- trunk/ui/insert/src/main/java/org/richfaces/ui/component/DummyHighLight.java (rev 0)
+++ trunk/ui/insert/src/main/java/org/richfaces/ui/component/DummyHighLight.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,41 @@
+/**
+ *
+ */
+package org.richfaces.ui.component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class DummyHighLight implements Highlight {
+
+ /* (non-Javadoc)
+ * @see org.richfaces.ui.component.Highlight#highlight(java.lang.String, java.io.InputStream, java.io.OutputStream, java.lang.String, boolean)
+ */
+ public void highlight(String name, InputStream in, ResponseWriter out,
+ String encoding) throws IOException {
+ out.startElement("pre",null);
+ InputStreamReader reader;
+ if (null != encoding) {
+ reader = new InputStreamReader(in, encoding);
+ } else {
+ reader = new InputStreamReader(in);
+ }
+ char[] temp = new char[1024];
+ int bytes;
+ while ((bytes = reader.read(temp)) > 0) {
+ out.writeText(temp, 0, bytes);
+ }
+ out.endElement("pre");
+ }
+
+
+}
Property changes on: trunk/ui/insert/src/main/java/org/richfaces/ui/component/DummyHighLight.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Deleted: trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java
===================================================================
--- trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java 2007-08-24 22:01:17 UTC (rev 2490)
+++ trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -1,62 +0,0 @@
-/**
- *
- */
-package org.richfaces.ui.component;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.faces.FacesException;
-
-import com.uwyn.jhighlight.renderer.Renderer;
-import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
-
-/**
- * @author asmirnov
- *
- */
-public class Highlight {
-
-
-
- private Renderer _renderer;
-
- public Highlight(String type) {
- _renderer = XhtmlRendererFactory.getRenderer(type);
- if(null == _renderer){
- throw new FacesException("Unknown type ["+type+"] to highlight source");
- }
- }
-
- /**
- * @param name
- * @param in
- * @param out
- * @param encoding
- * @param fragment
- * @throws IOException
- * @see com.uwyn.jhighlight.renderer.Renderer#highlight(java.lang.String, java.io.InputStream, java.io.OutputStream, java.lang.String, boolean)
- */
- public void highlight(String name, InputStream in, OutputStream out,
- String encoding, boolean fragment) throws IOException {
- _renderer.highlight(name, in, out, encoding, fragment);
- }
-
- /**
- * @param name
- * @param in
- * @param encoding
- * @param fragment
- * @return
- * @throws IOException
- * @see com.uwyn.jhighlight.renderer.Renderer#highlight(java.lang.String, java.lang.String, java.lang.String, boolean)
- */
- public String highlight(String name, String in, String encoding,
- boolean fragment) throws IOException {
- return _renderer.highlight(name, in, encoding, fragment);
- }
-
-
-
-}
Added: trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java
===================================================================
--- trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java (rev 0)
+++ trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,23 @@
+package org.richfaces.ui.component;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.faces.context.ResponseWriter;
+
+public interface Highlight {
+
+ /**
+ * @param name
+ * @param in
+ * @param out
+ * @param encoding
+ * @throws IOException
+ * @see com.uwyn.jhighlight.renderer.Renderer#highlight(java.lang.String, java.io.InputStream, java.io.OutputStream, java.lang.String, boolean)
+ */
+ public void highlight(String name, InputStream in, ResponseWriter out,
+ String encoding) throws IOException;
+
+
+
+}
\ No newline at end of file
Copied: trunk/ui/insert/src/main/java/org/richfaces/ui/component/HighlightImpl.java (from rev 2484, trunk/ui/insert/src/main/java/org/richfaces/ui/component/Highlight.java)
===================================================================
--- trunk/ui/insert/src/main/java/org/richfaces/ui/component/HighlightImpl.java (rev 0)
+++ trunk/ui/insert/src/main/java/org/richfaces/ui/component/HighlightImpl.java 2007-08-24 23:22:01 UTC (rev 2491)
@@ -0,0 +1,56 @@
+/**
+ *
+ */
+package org.richfaces.ui.component;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.faces.FacesException;
+import javax.faces.context.ResponseWriter;
+
+import com.uwyn.jhighlight.renderer.Renderer;
+import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class HighlightImpl implements Highlight {
+
+
+
+ private Renderer _renderer;
+
+ public HighlightImpl(String type) {
+ _renderer = XhtmlRendererFactory.getRenderer(type);
+ if(null == _renderer){
+ throw new FacesException("Unknown type ["+type+"] to highlight source");
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.ui.component.Highlight#highlight(java.lang.String, java.io.InputStream, java.io.OutputStream, java.lang.String, boolean)
+ */
+ public void highlight(String name, InputStream in, ResponseWriter out,
+ String encoding) throws IOException {
+ ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ _renderer.highlight(name, in, outStream, encoding, true);
+ if(null == encoding){
+ out.write(outStream.toString());
+ } else {
+ out.write(outStream.toString(encoding));
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.ui.component.Highlight#highlight(java.lang.String, java.lang.String, java.lang.String, boolean)
+ */
+ public String highlight(String name, String in, String encoding) throws IOException {
+ return _renderer.highlight(name, in, encoding, true);
+ }
+
+
+
+}
More information about the richfaces-svn-commits
mailing list