[richfaces-svn-commits] JBoss Rich Faces SVN: r1998 - in trunk: cdk/generator/src/main/java/org/ajax4jsf/builder/config and 15 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 1 20:30:50 EDT 2007
Author: alexsmirnov
Date: 2007-08-01 20:30:50 -0400 (Wed, 01 Aug 2007)
New Revision: 1998
Added:
trunk/cdk/AJSF-113.patch
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/TestController.java
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
trunk/samples/seamIntegration/src/main/webapp/pages/AJSF86.xhtml
trunk/samples/useCases/src/main/java/org/ajax4jsf/ObjectNotFoundException.java
trunk/samples/useCases/src/main/java/org/ajax4jsf/TestBean.java
trunk/samples/useCases/src/main/webapp/pages/messages.xhtml
trunk/sandbox/samples/calendar-sample/
trunk/sandbox/ui/calendar/
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates/converterTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates/validatorTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/converterTag.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
trunk/samples/seamIntegration/pom.xml
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml
trunk/samples/useCases/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml
trunk/ui/core/pom.xml
trunk/ui/core/src/main/config/component/repeat.xml
trunk/ui/core/src/main/config/component/support.xml
Log:
Fixed :
http://jira.jboss.org/jira/browse/AJSF-113
http://jira.jboss.org/jira/browse/AJSF-85
http://jira.jboss.org/jira/browse/AJSF-84
http://jira.jboss.org/jira/browse/AJSF-83
http://jira.jboss.org/jira/browse/AJSF-80
Added: trunk/cdk/AJSF-113.patch
===================================================================
--- trunk/cdk/AJSF-113.patch (rev 0)
+++ trunk/cdk/AJSF-113.patch 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,52 @@
+Index: generator/src/main/resources/META-INF/templates/converterTag.vm
+===================================================================
+--- generator/src/main/resources/META-INF/templates/converterTag.vm (revision 313)
++++ generator/src/main/resources/META-INF/templates/converterTag.vm (working copy)
+@@ -59,7 +59,7 @@
+
+ protected Converter createConverter() throws JspException
+ {
+- ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
++ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}");
+ _setProperties(converter);
+ return converter;
+ }
+Index: generator/src/main/resources/META-INF/templates/validatorTag.vm
+===================================================================
+--- generator/src/main/resources/META-INF/templates/validatorTag.vm (revision 313)
++++ generator/src/main/resources/META-INF/templates/validatorTag.vm (working copy)
+@@ -61,7 +61,7 @@
+
+ protected Validator createValidator() throws JspException
+ {
+- ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
++ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}");
+ _setProperties(validator);
+ return validator;
+ }
+Index: generator/src/main/resources/META-INF/templates12/converterTag.vm
+===================================================================
+--- generator/src/main/resources/META-INF/templates12/converterTag.vm (revision 313)
++++ generator/src/main/resources/META-INF/templates12/converterTag.vm (working copy)
+@@ -59,7 +59,7 @@
+
+ protected Converter createConverter() throws JspException
+ {
+- ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
++ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}");
+ _setProperties(converter);
+ return converter;
+ }
+Index: generator/src/main/resources/META-INF/templates12/validatorTag.vm
+===================================================================
+--- generator/src/main/resources/META-INF/templates12/validatorTag.vm (revision 313)
++++ generator/src/main/resources/META-INF/templates12/validatorTag.vm (working copy)
+@@ -58,7 +58,7 @@
+
+ protected Validator createValidator() throws JspException
+ {
+- ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
++ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}");
+ _setProperties(validator);
+ return validator;
+ }
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -381,7 +381,7 @@
// Set this config as root.
digester.push(this);
try {
- digester.parse(configFile.toString());
+ digester.parse(configFile);
} catch (IOException e) {
// TODO Auto-generated catch block
throw new ParsingException("I/O error on parsing config file ", e);
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -79,7 +79,7 @@
#if( !$prop.existintag )
#if(!$prop.el)
if(isValueReference(this._${prop.name})){
- throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}");
}
#end
#if($prop.name == "action")
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/converterTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/converterTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/converterTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -59,7 +59,7 @@
protected Converter createConverter() throws JspException
{
- ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
+ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}");
_setProperties(converter);
return converter;
}
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/validatorTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/validatorTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/validatorTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -61,7 +61,7 @@
protected Validator createValidator() throws JspException
{
- ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
+ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}");
_setProperties(validator);
return validator;
}
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -79,7 +79,7 @@
#if( !$prop.existintag )
#if(!$prop.el)
if(isValueReference(this._${prop.name})){
- throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext() +" not allowed EL expression for property ${prop.name}")
+ throw new IllegalArgumentException("Component ${component.name} with Id " + component.getClientId(getFacesContext()) +" not allowed EL expression for property ${prop.name}");
}
#end
#if($prop.name == "action")
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/converterTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/converterTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/converterTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -1,95 +1,95 @@
-/**
- * GENERATED FILE - DO NOT EDIT
- *
- */
-package ${tag.packageName};
-
-#foreach($import in $imports)
-import $import ;
-#end
-import javax.faces.component.UIComponent;
-import javax.faces.convert.Converter;
-import javax.faces.webapp.UIComponentTag;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import org.apache.commons.beanutils.ConvertUtils;
-import javax.servlet.jsp.JspException;
-import ${converter.classname};
-
-public class $tag.simpleClassName extends $tag.superclass
-{
-
-// Fields
-#foreach( $prop in $converter.properties )
-#if( !$prop.existintag )
- /*
- * $prop.name
- * ${prop.xmlEncodedDescription}
- */
- private String _$prop.name = null;
-
-#end
-#end
-// Setters
-#foreach( $prop in $converter.properties )
-#if( !$prop.existintag )
- /*
- * $prop.description
- * Setter for $prop.name
- * @param $prop.name - new value
- */
- public void ${prop.setterName}(String __${prop.name})
- {
- this._${prop.name} = __${prop.name};
- }
-
-#end
-#if( $prop.alias)
- /*
- * ${prop.xmlEncodedDescription}
- * Setter for alias of $prop.name as $prop.alias
- * @param $prop.name - new value
- */
- public void set${prop.upperFirstChar($prop.alias)}(String __${prop.alias})
- {
- this.${prop.setterName}(__${prop.alias});
- }
-#end
-#end
-
- protected Converter createConverter() throws JspException
- {
- ${converter.simpleClassName} converter = new ${converter.simpleClassName}();
- _setProperties(converter);
- return converter;
- }
-
- // Support method to wire in attributes
- private void _setProperties(${converter.simpleClassName} converter) throws JspException
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
-#foreach( $prop in $converter.properties )
-#if( !$prop.existintag )
- if (_${prop.name} != null)
- {
-#if( ${prop.el} )
- if (UIComponentTag.isValueReference(_${prop.name}))
- {
- ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
- converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
- }
-#if (!${prop.elonly})
- else
- {
- converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
- }
-#end
- }
-#else
- converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
-#end
-#end
-#end
- }
-
-}
+/**
+ * GENERATED FILE - DO NOT EDIT
+ *
+ */
+package ${tag.packageName};
+
+#foreach($import in $imports)
+import $import ;
+#end
+import javax.faces.component.UIComponent;
+import javax.faces.convert.Converter;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import org.apache.commons.beanutils.ConvertUtils;
+import javax.servlet.jsp.JspException;
+import ${converter.classname};
+
+public class $tag.simpleClassName extends $tag.superclass
+{
+
+// Fields
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+ /*
+ * $prop.name
+ * ${prop.xmlEncodedDescription}
+ */
+ private String _$prop.name = null;
+
+#end
+#end
+// Setters
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+ /*
+ * $prop.description
+ * Setter for $prop.name
+ * @param $prop.name - new value
+ */
+ public void ${prop.setterName}(String __${prop.name})
+ {
+ this._${prop.name} = __${prop.name};
+ }
+
+#end
+#if( $prop.alias)
+ /*
+ * ${prop.xmlEncodedDescription}
+ * Setter for alias of $prop.name as $prop.alias
+ * @param $prop.name - new value
+ */
+ public void set${prop.upperFirstChar($prop.alias)}(String __${prop.alias})
+ {
+ this.${prop.setterName}(__${prop.alias});
+ }
+#end
+#end
+
+ protected Converter createConverter() throws JspException
+ {
+ ${converter.simpleClassName} converter = (${converter.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createConverter("${converter.id}");
+ _setProperties(converter);
+ return converter;
+ }
+
+ // Support method to wire in attributes
+ private void _setProperties(${converter.simpleClassName} converter) throws JspException
+ {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+#foreach( $prop in $converter.properties )
+#if( !$prop.existintag )
+ if (_${prop.name} != null)
+ {
+#if( ${prop.el} )
+ if (UIComponentTag.isValueReference(_${prop.name}))
+ {
+ ValueBinding vb = facesContext.getApplication().createValueBinding(_${prop.name});
+ converter.${prop.setterName}((${prop.simpleClassName}) vb.getValue(facesContext));
+ }
+#if (!${prop.elonly})
+ else
+ {
+ converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+ }
+#end
+ }
+#else
+ converter.${prop.setterName}((${prop.simpleClassName}) ConvertUtils.convert(_${prop.name}, ${prop.simpleClassName}.class));
+#end
+#end
+#end
+ }
+
+}
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/validatorTag.vm 2007-08-02 00:30:50 UTC (rev 1998)
@@ -58,7 +58,7 @@
protected Validator createValidator() throws JspException
{
- ${validator.simpleClassName} validator = new ${validator.simpleClassName}();
+ ${validator.simpleClassName} validator = (${validator.simpleClassName}) FacesContext.getCurrentInstance().getApplication().createValidator("${validator.id}");
_setProperties(validator);
return validator;
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -175,6 +175,8 @@
public static final String nowrap_ATTRIBUTE = "nowrap";
+ public static final String src_ATTRIBUTE = "src";
+
//public static final String onreset_ATTRIBUTE = "onreset";
// attributes sets.
public static final String[] PASS_THRU = {
@@ -307,6 +309,7 @@
public static final String CAPTION_ELEMENT = "caption";
public static final String THEAD_ELEMENT = "thead";
public static final String TFOOT_ELEMENT = "tfoot";
+ public static final String IMG_ELEMENT = "img";
}
/**
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -71,6 +71,8 @@
static final String RESOURCE_URI_PREFIX_WITH_SLASH = "/"
+ RESOURCE_URI_PREFIX;
+ public static final String RESOURCE_URI_PREFIX_PARAM = "org.ajax4jsf.RESOURCE_URI_PREFIX";
+
/**
* Prefix for Resourse-Ajax filter, in common must be same as for
* {@link javax.faces.webapp.FacesServlet}
@@ -158,7 +160,7 @@
dig.push(this);
try {
dig.parse(webXml);
- this.setFilterName(filterName);
+ this.setFilterName(filterName, context);
// Store Instance to context attribute.
context.setAttribute(CONTEXT_ATTRIBUTE,this);
} catch (IOException e) {
@@ -357,8 +359,9 @@
*
* @param filterName
* The filterName to set.
+ * @param context TODO
*/
- void setFilterName(String filterName) {
+ void setFilterName(String filterName, ServletContext context) {
if (null == filterName) {
_log.warn(Messages.getMessage(Messages.NULL_FILTER_NAME_WARNING));
return;
@@ -386,16 +389,20 @@
}
}
}
+ String resourcePrefix = (String) context.getAttribute(RESOURCE_URI_PREFIX_PARAM);
+ if(null == resourcePrefix){
+ resourcePrefix = RESOURCE_URI_PREFIX;
+ }
if (null != _facesFilterPrefix) {
_prefixMapping = true;
if (_facesFilterPrefix.endsWith("/")) {
- setResourcePrefix(RESOURCE_URI_PREFIX);
+ setResourcePrefix(resourcePrefix);
} else {
- setResourcePrefix(RESOURCE_URI_PREFIX_WITH_SLASH);
+ setResourcePrefix("/"+resourcePrefix);
}
} else if (null != _facesFilterSuffix) {
_prefixMapping = false;
- setResourcePrefix(RESOURCE_URI_PREFIX_WITH_SLASH);
+ setResourcePrefix("/"+resourcePrefix);
} else {
throw new IllegalStateException(Messages.getMessage(
Messages.NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR,
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/seamIntegration/pom.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -30,6 +30,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
<version>3.3.0.ga</version>
+ <scope>provided</scope>
</dependency>
<!--
<dependency>
@@ -47,6 +48,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>3.0.0.ga</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -89,6 +91,7 @@
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.4.ga</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/Bean.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -44,6 +44,7 @@
*/
private static final long serialVersionUID = -4209339000953631111L;
private String text;
+ private String text2;
/**
* @return the text
@@ -77,4 +78,18 @@
}
return null;
}
+
+ /**
+ * @return the text2
+ */
+ public String getText2() {
+ return text2;
+ }
+
+ /**
+ * @param text2 the text2 to set
+ */
+ public void setText2(String text2) {
+ this.text2 = text2;
+ }
}
\ No newline at end of file
Added: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java (rev 0)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,93 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+import static org.jboss.seam.annotations.Install.FRAMEWORK;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.transaction.AbstractUserTransaction;
+
+/**
+ * @author asmirnov
+ *
+ */
+ at Name("org.jboss.seam.transaction.transaction")
+ at Scope(ScopeType.EVENT)
+ at Install(value=false, precedence=FRAMEWORK)
+ at BypassInterceptors
+public class DummyTransaction extends AbstractUserTransaction {
+
+ /* (non-Javadoc)
+ * @see org.jboss.seam.transaction.AbstractUserTransaction#registerSynchronization(javax.transaction.Synchronization)
+ */
+ @Override
+ public void registerSynchronization(Synchronization arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#begin()
+ */
+ public void begin() throws NotSupportedException, SystemException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#commit()
+ */
+ public void commit() throws HeuristicMixedException,
+ HeuristicRollbackException, IllegalStateException,
+ RollbackException, SecurityException, SystemException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#getStatus()
+ */
+ public int getStatus() throws SystemException {
+ // TODO Auto-generated method stub
+ return Status.STATUS_NO_TRANSACTION;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#rollback()
+ */
+ public void rollback() throws IllegalStateException, SecurityException,
+ SystemException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#setRollbackOnly()
+ */
+ public void setRollbackOnly() throws IllegalStateException, SystemException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.transaction.UserTransaction#setTransactionTimeout(int)
+ */
+ public void setTransactionTimeout(int arg0) throws SystemException {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/TestController.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/TestController.java (rev 0)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/TestController.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,26 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.faces.FacesMessages;
+
+import javax.faces.component.UIInput;
+
+ at Name("testController")
+public class TestController {
+ @In
+ FacesMessages facesMessages;
+ private UIInput input;
+ private String value;
+
+ public UIInput getInput() { return input; }
+
+ public void setInput(UIInput input) { this.input = input; }
+
+ public String getValue() { return value; }
+
+ public void setValue(String value) { this.value = value; }
+}
\ No newline at end of file
Property changes on: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/TestController.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS ENTITY="JSFProcess"/>
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -8,19 +8,19 @@
xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
<core:init debug="false" />
- <core:microcontainer installed="false" />
<core:manager conversation-timeout="120000"
concurrent-request-timeout="500" conversation-id-parameter="cid" />
- <transaction:no-transaction/>
<!--
+ <core:microcontainer installed="false" />
<persistence:hibernate-session-factory name="hibernateSessionFactory"/>
<persistence:managed-hibernate-session name="seamDatabase"
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/faces-config.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -2,11 +2,6 @@
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
- <managed-bean>
- <managed-bean-name>bean</managed-bean-name>
- <managed-bean-class>org.ajax4jsf.Bean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
<lifecycle>
<phase-listener>
org.jboss.seam.jsf.SeamPhaseListener
Added: trunk/samples/seamIntegration/src/main/webapp/pages/AJSF86.xhtml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/pages/AJSF86.xhtml (rev 0)
+++ trunk/samples/seamIntegration/src/main/webapp/pages/AJSF86.xhtml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a4j="http://richfaces.org/a4j">
+<head><title>Seam + ajax4jsf + binding</title></head>
+<body>
+<h:form>
+ Input:
+ <h:inputText binding="#{testController.input}"
+ value="#{testController.value}">
+ <a4j:support event="onkeyup" reRender="repeater"/>
+ </h:inputText>
+ <h:commandButton value="Ok" />
+ <br/>
+ Repeat:
+ <h:outputText id="repeater" value="#{testController.value}"/>
+</h:form>
+</body>
+</html>
Property changes on: trunk/samples/seamIntegration/src/main/webapp/pages/AJSF86.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/seamIntegration/src/main/webapp/pages/repeater.xhtml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -13,10 +13,10 @@
</h:inputText>
<h:outputText id="out" value="#{seamBean.text}"></h:outputText>
<h:outputText value="All form submit."></h:outputText>
- <h:inputText value="#{bean.text}">
+ <h:inputText value="#{seamBean.text2}">
<a4j:support reRender="out,outs,conversation" event="onkeyup"></a4j:support>
</h:inputText>
- <h:outputText id="outs" value="#{bean.text}"></h:outputText>
+ <h:outputText id="outs" value="#{seamBean.text2}"></h:outputText>
<h:outputText value="AJAX Single submit."></h:outputText>
<h:outputText id="conversation" value="Conversation ID: #{conversation.id}"></h:outputText>
<a4j:commandButton action="#{seamBean.start}" value="Start conversation" reRender="out,conversation"></a4j:commandButton>
Added: trunk/samples/useCases/src/main/java/org/ajax4jsf/ObjectNotFoundException.java
===================================================================
--- trunk/samples/useCases/src/main/java/org/ajax4jsf/ObjectNotFoundException.java (rev 0)
+++ trunk/samples/useCases/src/main/java/org/ajax4jsf/ObjectNotFoundException.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,12 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ObjectNotFoundException extends Exception {
+
+}
Property changes on: trunk/samples/useCases/src/main/java/org/ajax4jsf/ObjectNotFoundException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/useCases/src/main/java/org/ajax4jsf/TestBean.java
===================================================================
--- trunk/samples/useCases/src/main/java/org/ajax4jsf/TestBean.java (rev 0)
+++ trunk/samples/useCases/src/main/java/org/ajax4jsf/TestBean.java 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,64 @@
+package org.ajax4jsf;
+
+
+
+import java.util.logging.Logger;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+/**
+ * @author krasi
+ *
+ */
+public class TestBean {
+ String id = "";
+ static final Logger LOGGER = Logger.getLogger(TestBean.class.getName());
+
+ public TestBean() {
+ }
+
+ public String getId() {
+
+ FacesContext.getCurrentInstance().addMessage(
+ null,
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, "Message 1.",
+ ""));
+
+ System.out.println("GET 1 ------" + id);
+ if (!id.equals("")) {
+ System.out.println("GET 2 ------" + id);
+ FacesContext.getCurrentInstance().addMessage(
+ null,
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, "Message 2.",
+ "11"));
+
+ try {
+ System.out.println("GET 3 ------" + id);
+ throw new ObjectNotFoundException();
+
+ } catch (ObjectNotFoundException e) {
+ System.out.println("GET 4 ------" + id);
+ FacesContext.getCurrentInstance().addMessage(
+ null,
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, "Message 3.",
+ "11"));
+ }
+
+ }
+
+ return id;
+ }
+
+ public void setId(String id) {
+ System.out.println("SET 1-" + id);
+ this.id = id;
+ }
+
+ public String searchByID() {
+ System.out.println("searchByID");
+ return null;
+
+ }
+
+}
Property changes on: trunk/samples/useCases/src/main/java/org/ajax4jsf/TestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/useCases/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/useCases/src/main/webapp/WEB-INF/faces-config.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/useCases/src/main/webapp/WEB-INF/faces-config.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -37,6 +37,11 @@
<managed-bean-class>control.test.ControlBackingBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>delme</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.TestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
<navigation-rule>
<navigation-case>
Modified: trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml
===================================================================
--- trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/samples/useCases/src/main/webapp/pages/ajaxSingle.xhtml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -56,6 +56,9 @@
<a4j:commandButton value="Ajax Button"></a4j:commandButton>
<a4j:commandButton value="Ajax Single Button" ajaxSingle="true"></a4j:commandButton>
</h:form>
+ <a4j:status>
+ <f:facet name="start"><h:panelGroup layout="block" id="loading">Loading</h:panelGroup></f:facet>
+</a4j:status>
<a4j:log hotkey="M"></a4j:log>
</f:view>
</html>
Added: trunk/samples/useCases/src/main/webapp/pages/messages.xhtml
===================================================================
--- trunk/samples/useCases/src/main/webapp/pages/messages.xhtml (rev 0)
+++ trunk/samples/useCases/src/main/webapp/pages/messages.xhtml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="WINDOWS-1251"?>
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:t="http://myfaces.apache.org/tomahawk"
+ xmlns:ft="http://sourceforge.net/projects/facestrace">
+
+<head>
+<title></title>
+
+</head>
+<body>
+<ui:debug hotkey="q" />
+<f:view>
+
+<a4j:outputPanel id="myMessageanel" ajaxRendered="true">
+<h:messages />
+</a4j:outputPanel>
+
+<h:form>
+<h:panelGroup id="a123">
+<h:inputText value="#{delme.id}"></h:inputText>
+
+<a4j:commandButton action="#{delme.searchByID}" value="Ajax" reRender="a123"></a4j:commandButton>
+<h:commandButton action="#{delme.searchByID}" value="Ok"></h:commandButton>
+</h:panelGroup>
+</h:form>
+
+</f:view>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/samples/useCases/src/main/webapp/pages/messages.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ui/core/pom.xml
===================================================================
--- trunk/ui/core/pom.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/ui/core/pom.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<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">
Modified: trunk/ui/core/src/main/config/component/repeat.xml
===================================================================
--- trunk/ui/core/src/main/config/component/repeat.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/ui/core/src/main/config/component/repeat.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -47,7 +47,7 @@
<classname>java.lang.String</classname>
<description>It defines EL-binding for a component state for saving or redefinition.</description>
</property>
- <property>
+ <property el="false">
<name>stateVar</name>
<classname>java.lang.String</classname>
<description>The attribute provides access to a component state on the client side.</description>
@@ -62,7 +62,7 @@
<classname>java.lang.String</classname>
<description>This attribute defines strings that are updated after an AJAX request.</description>
</property>
- <property>
+ <property el="false">
<name>rowKeyVar</name>
<classname>java.lang.String</classname>
<description>The attribute provides access to a row key in a Request scope.</description>
Modified: trunk/ui/core/src/main/config/component/support.xml
===================================================================
--- trunk/ui/core/src/main/config/component/support.xml 2007-08-02 00:21:45 UTC (rev 1997)
+++ trunk/ui/core/src/main/config/component/support.xml 2007-08-02 00:30:50 UTC (rev 1998)
@@ -88,7 +88,7 @@
event
</description>
</property>
- <property>
+ <property el="false">
<name>event</name>
<classname>java.lang.String</classname>
<description>
More information about the richfaces-svn-commits
mailing list