richfaces-svn-commits
November 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 433 discussions
JBoss Rich Faces SVN: r20014 - in trunk: cdk/generator and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-10 10:12:10 -0500 (Wed, 10 Nov 2010)
New Revision: 20014
Modified:
trunk/bom/pom.xml
trunk/cdk/generator/pom.xml
trunk/cdk/maven-cdk-plugin/src/it/annotated-component/pom.xml
trunk/cdk/maven-cdk-plugin/src/it/renderer-template-test/pom.xml
trunk/cdk/maven-cdk-plugin/src/it/xml-configured-component/pom.xml
trunk/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml
Log:
JSF version updated to 2.0.3-b03
Modified: trunk/bom/pom.xml
===================================================================
--- trunk/bom/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/bom/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -139,12 +139,12 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3-b03</version>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3-b03</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: trunk/cdk/generator/pom.xml
===================================================================
--- trunk/cdk/generator/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/cdk/generator/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -127,7 +127,7 @@
may be needed, cdk-parent/cdk-bom? -->
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3-b03</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Modified: trunk/cdk/maven-cdk-plugin/src/it/annotated-component/pom.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/cdk/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-b03</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/cdk/maven-cdk-plugin/src/it/renderer-template-test/pom.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/it/renderer-template-test/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/cdk/maven-cdk-plugin/src/it/renderer-template-test/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -66,7 +66,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
+ <version>2.0.3-b03</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/cdk/maven-cdk-plugin/src/it/xml-configured-component/pom.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/it/xml-configured-component/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/cdk/maven-cdk-plugin/src/it/xml-configured-component/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-b03</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml
===================================================================
--- trunk/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml 2010-11-10 15:03:37 UTC (rev 20013)
+++ trunk/cdk/maven-resources-plugin/src/it/richfaces-application/pom.xml 2010-11-10 15:12:10 UTC (rev 20014)
@@ -69,7 +69,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-b03</version>
<scope>compile</scope>
</dependency>
<dependency>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20013 - in modules/tests/metamer/trunk/application/src/main: webapp/components/richInplaceInput and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-11-10 10:03:37 -0500 (Wed, 10 Nov 2010)
New Revision: 20013
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
Log:
https://jira.jboss.org/browse/RFPL-757
* set of attributes updated
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-11-10 15:00:38 UTC (rev 20012)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-11-10 15:03:37 UTC (rev 20013)
@@ -36,6 +36,7 @@
import javax.faces.bean.SessionScoped;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
import javax.faces.model.SelectItem;
import javax.servlet.http.HttpSession;
@@ -369,4 +370,14 @@
public void dummyActionListener(ActionEvent event) {
logToPage("* action listener invoked");
}
+
+ /**
+ * A value change listener that logs to the page old and new value.
+ *
+ * @param event
+ * an event representing the activation of a user interface component (not used)
+ */
+ public void valueChangeListener(ValueChangeEvent event) {
+ RichBean.logToPage("* value changed: " + event.getOldValue() + " -> " + event.getNewValue());
+ }
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-11-10 15:00:38 UTC (rev 20012)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceInputBean.java 2010-11-10 15:03:37 UTC (rev 20013)
@@ -54,7 +54,7 @@
logger = LoggerFactory.getLogger(getClass());
logger.debug("initializing bean " + getClass().getName());
- attributes = Attributes.getUIComponentAttributes(UIInplaceInput.class, getClass());
+ attributes = Attributes.getUIComponentAttributes(UIInplaceInput.class, getClass(), false);
attributes.setAttribute("defaultLabel", "Click here to edit");
attributes.setAttribute("editEvent", "click");
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2010-11-10 15:00:38 UTC (rev 20012)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2010-11-10 15:03:37 UTC (rev 20013)
@@ -41,22 +41,25 @@
<ui:define name="component">
<rich:inplaceInput id="inplaceInput"
+ changedStateClass="#{richInplaceInputBean.attributes['changedStateClass'].value}"
converter="#{richInplaceInputBean.attributes['converter'].value}"
converterMessage="#{richInplaceInputBean.attributes['converterMessage'].value}"
defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}"
+ disableStateClass="#{richInplaceInputBean.attributes['disableStateClass'].value}"
+ editClass="#{richInplaceInputBean.attributes['editClass'].value}"
editEvent="#{richInplaceInputBean.attributes['editEvent'].value}"
+ editStateClass="#{richInplaceInputBean.attributes['editStateClass'].value}"
immediate="#{richInplaceInputBean.attributes['immediate'].value}"
inputWidth="#{richInplaceInputBean.attributes['inputWidth'].value}"
- localValue="#{richInplaceInputBean.attributes['localValue'].value}"
- localValueSet="#{richInplaceInputBean.attributes['localValueSet'].value}"
+ noneClass="#{richInplaceInputBean.attributes['noneClass'].value}"
onblur="#{richInplaceInputBean.attributes['onblur'].value}"
onclick="#{richInplaceInputBean.attributes['onclick'].value}"
ondblclick="#{richInplaceInputBean.attributes['ondblclick'].value}"
onfocus="#{richInplaceInputBean.attributes['onfocus'].value}"
oninputblur="#{richInplaceInputBean.attributes['oninputblur'].value}"
- oninputchangechange="#{richInplaceInputBean.attributes['oninputchange'].value}"
+ oninputchange="#{richInplaceInputBean.attributes['oninputchange'].value}"
oninputclick="#{richInplaceInputBean.attributes['oninputclick'].value}"
- oninputdblClick="#{richInplaceInputBean.attributes['oninputdblClick'].value}"
+ oninputdblclick="#{richInplaceInputBean.attributes['oninputdblclick'].value}"
oninputfocus="#{richInplaceInputBean.attributes['oninputfocus'].value}"
oninputkeydown="#{richInplaceInputBean.attributes['oninputkeydown'].value}"
oninputkeypress="#{richInplaceInputBean.attributes['oninputkeypress'].value}"
@@ -75,19 +78,17 @@
onmouseout="#{richInplaceInputBean.attributes['onmouseout'].value}"
onmouseover="#{richInplaceInputBean.attributes['onmouseover'].value}"
onmouseup="#{richInplaceInputBean.attributes['onmouseup'].value}"
+ readyStateClass="#{richInplaceInputBean.attributes['readyStateClass'].value}"
rendered="#{richInplaceInputBean.attributes['rendered'].value}"
required="#{richInplaceInputBean.attributes['required'].value}"
requiredMessage="#{richInplaceInputBean.attributes['requiredMessage'].value}"
+ saveOnBlur="#{richInplaceInputBean.attributes['saveOnBlur'].value}"
showControls="#{richInplaceInputBean.attributes['showControls'].value}"
state="#{richInplaceInputBean.attributes['state'].value}"
- submittedValue="#{richInplaceInputBean.attributes['submittedValue'].value}"
tabIndex="#{richInplaceInputBean.attributes['tabIndex'].value}"
- valid="#{richInplaceInputBean.attributes['valid'].value}"
validatorMessage="#{richInplaceInputBean.attributes['validatorMessage'].value}"
- validators="#{richInplaceInputBean.attributes['validators'].value}"
value="#{richInplaceInputBean.attributes['value'].value}"
- valueChangeListener="#{richInplaceInputBean.attributes['valueChangeListener'].value}"
- valueChangeListeners="#{richInplaceInputBean.attributes['valueChangeListeners'].value}"
+ valueChangeListener="#{richBean.valueChangeListener}"
>
<a4j:ajax event="inputchange" render="output"/>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20012 - in trunk/ui/output/ui: src/main/java/org/richfaces/component/behavior and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-11-10 10:00:38 -0500 (Wed, 10 Nov 2010)
New Revision: 20012
Modified:
trunk/ui/output/ui/pom.xml
trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
https://jira.jboss.org/browse/RF-9720
Modified: trunk/ui/output/ui/pom.xml
===================================================================
--- trunk/ui/output/ui/pom.xml 2010-11-10 13:23:20 UTC (rev 20011)
+++ trunk/ui/output/ui/pom.xml 2010-11-10 15:00:38 UTC (rev 20012)
@@ -56,11 +56,14 @@
<artifactId>richfaces-core-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui.common</groupId>
<artifactId>richfaces-ui-common-ui</artifactId>
</dependency>
<dependency>
- <!-- todo remove this dependency -->
<groupId>org.richfaces.ui.core</groupId>
<artifactId>richfaces-ui-core-ui</artifactId>
</dependency>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-11-10 13:23:20 UTC (rev 20011)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-11-10 15:00:38 UTC (rev 20012)
@@ -28,6 +28,9 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.component.behavior.ClientBehavior;
+import org.richfaces.cdk.annotations.JsfBehavior;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
import org.richfaces.component.AbstractTogglePanel;
import org.richfaces.renderkit.util.RendererUtils;
@@ -35,6 +38,8 @@
* @author akolonitsky
*
*/
+
+@JsfBehavior(id = "org.richfaces.behavior.ToggleControl", tag = @Tag(name = "toggleControl", handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler", type = TagType.Facelets))
public class ToggleControl extends ClientBehavior {
public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.ToggleControl";
@@ -127,12 +132,12 @@
@Override
public void setLiteralAttribute(String name, Object value) {
-// if (compare(PropertyKeys.operation, name)) {
-// setOperation((String) value);
-// } else if (compare(PropertyKeys.target, name)) {
-// setTargetItem((String) value);
-// } else if (compare(PropertyKeys.selector, name)) {
-// setTargetPanel((String) value);
-// }
+ if (compare(PropertyKeys.targetItem, name)) {
+ setTargetItem((String) value);
+ } else if (compare(PropertyKeys.targetPanel, name)) {
+ setTargetPanel((String) value);
+ } else if (compare(PropertyKeys.disableDefault, name)) {
+ setDisableDefault((Boolean)value);
+ }
}
}
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-11-10 13:23:20 UTC (rev 20011)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-11-10 15:00:38 UTC (rev 20012)
@@ -11,6 +11,7 @@
<tag-name>toggleControl</tag-name>
<behavior>
<behavior-id>org.richfaces.component.behavior.ToggleControl</behavior-id>
+ <handler-class>org.richfaces.view.facelets.html.CustomBehaviorHandler</handler-class>
</behavior>
</tag>
<tag>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20011 - trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-10 08:23:20 -0500 (Wed, 10 Nov 2010)
New Revision: 20011
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
Log:
https://jira.jboss.org/browse/RF-9774
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-11-10 13:17:12 UTC (rev 20010)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-11-10 13:23:20 UTC (rev 20011)
@@ -223,7 +223,7 @@
todayControl: CalendarView.todayControl,
closeControl: CalendarView.closeControl,
applyControl: CalendarView.applyControl,
- timeEditorFields: CalendarView.timeEditorFields,
+ timeEditorFields: CalendarView.timeEditorFields
});
// must be :defaultTime, minDaysInFirstWeek, firstWeekday, weekDayLabels, weekDayLabelsShort, monthLabels, monthLabelsShort
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20010 - in sandbox/trunk/ui: notify/demo and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-10 08:17:12 -0500 (Wed, 10 Nov 2010)
New Revision: 20010
Modified:
sandbox/trunk/ui/notify/bom/pom.xml
sandbox/trunk/ui/notify/demo/pom.xml
sandbox/trunk/ui/notify/ui/pom.xml
sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java
sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java
sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java
sandbox/trunk/ui/schedule/bom/pom.xml
sandbox/trunk/ui/schedule/demo/pom.xml
sandbox/trunk/ui/schedule/ui/pom.xml
sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractSchedule.java
sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractScheduleItem.java
sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java
sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
sandbox/trunk/ui/schedule/ui/src/main/resources/META-INF/resources/richfaces.schedule.js
sandbox/trunk/ui/schedule/ui/src/main/templates/org/richfaces/schedule.template.xml
Log:
Sandbox components updated for new/refactored API
Modified: sandbox/trunk/ui/notify/bom/pom.xml
===================================================================
--- sandbox/trunk/ui/notify/bom/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/bom/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -39,15 +39,15 @@
<packaging>pom</packaging>
<properties>
- <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
+ <org.richfaces.version>4.0.0-SNAPSHOT</org.richfaces.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.core</groupId>
- <artifactId>richfaces-ui-core-bom</artifactId>
- <version>${org.richfaces.core.version}</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: sandbox/trunk/ui/notify/demo/pom.xml
===================================================================
--- sandbox/trunk/ui/notify/demo/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/demo/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -61,14 +61,6 @@
<artifactId>${jsf2.impl.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
</dependencies>
</project>
Modified: sandbox/trunk/ui/notify/ui/pom.xml
===================================================================
--- sandbox/trunk/ui/notify/ui/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/ui/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -86,11 +86,6 @@
<!-- tests -->
<dependency>
- <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: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java
===================================================================
--- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyMessagesRenderer.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -22,19 +22,20 @@
package org.richfaces.renderkit.html;
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.component.AbstractNotify;
-import org.richfaces.component.AbstractNotifyMessages;
+import java.io.IOException;
+import java.util.Iterator;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Iterator;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractNotify;
+import org.richfaces.component.AbstractNotifyMessages;
+import org.richfaces.renderkit.HtmlConstants;
+import org.richfaces.renderkit.util.RendererUtils;
+
@JsfRenderer(family = AbstractNotifyMessages.COMPONENT_FAMILY, type = NotifyMessagesRenderer.RENDERER_TYPE)
public class NotifyMessagesRenderer extends NotifyRenderer {
@@ -44,8 +45,8 @@
public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
AbstractNotifyMessages messagesComponent = (AbstractNotifyMessages) component;
ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.DIV_ELEM, null);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, RendererUtils.getInstance().clientId(context, component), "type");
+ writer.startElement(HtmlConstants.DIV_ELEM, null);
+ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, RendererUtils.getInstance().clientId(context, component), "type");
Integer delay = messagesComponent.getDelay();
if (delay == null) {
delay = 0;
@@ -98,6 +99,6 @@
delay += interval;
msg.rendered();
}
- writer.endElement(HTML.DIV_ELEM);
+ writer.endElement(HtmlConstants.DIV_ELEM);
}
}
Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java
===================================================================
--- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyRenderer.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -22,24 +22,25 @@
package org.richfaces.renderkit.html;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.component.AbstractNotify;
-import org.richfaces.component.AbstractNotifyStack;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import org.ajax4jsf.javascript.JSFunction;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractNotify;
+import org.richfaces.component.AbstractNotifyStack;
+import org.richfaces.renderkit.AjaxComponentRendererBase;
+import org.richfaces.renderkit.HtmlConstants;
+
@JsfRenderer(family = AbstractNotify.COMPONENT_FAMILY, type = NotifyRenderer.RENDERER_TYPE)
@ResourceDependencies({
@ResourceDependency(library = "javax.faces", name = "jsf.js"),
@@ -77,14 +78,14 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.DIV_ELEM, null);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, getUtils().clientId(context, component), "type");
- writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", "type");
+ writer.startElement(HtmlConstants.DIV_ELEM, null);
+ writer.writeAttribute(HtmlConstants.ID_ATTRIBUTE, getUtils().clientId(context, component), "type");
+ writer.startElement(HtmlConstants.SCRIPT_ELEM, null);
+ writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", "type");
writer.writeText(new JSFunction("RichFaces.Notify", getOptions(context, (AbstractNotify) component)), null);
writer.writeText(";", null);
- writer.endElement(HTML.SCRIPT_ELEM);
- writer.endElement(HTML.DIV_ELEM);
+ writer.endElement(HtmlConstants.SCRIPT_ELEM);
+ writer.endElement(HtmlConstants.DIV_ELEM);
}
protected Map<String, Object> getOptions(FacesContext context, AbstractNotify notify) throws IOException {
Modified: sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java
===================================================================
--- sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/notify/ui/src/main/java/org/richfaces/renderkit/html/NotifyStackRenderer.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -22,22 +22,23 @@
package org.richfaces.renderkit.html;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.component.AbstractNotifyStack;
-import org.richfaces.renderkit.AjaxComponentRendererBase;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import org.ajax4jsf.javascript.JSFunction;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.component.AbstractNotifyStack;
+import org.richfaces.renderkit.AjaxComponentRendererBase;
+import org.richfaces.renderkit.HtmlConstants;
+import org.richfaces.renderkit.util.RendererUtils;
+
@JsfRenderer(family = AbstractNotifyStack.COMPONENT_FAMILY, type = NotifyStackRenderer.RENDERER_TYPE)
@ResourceDependencies({
@ResourceDependency(name = "jquery.js", target = "head"),
@@ -54,12 +55,12 @@
return;
}
ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.SCRIPT_ELEM, null);
+ writer.startElement(HtmlConstants.SCRIPT_ELEM, null);
writer.writeText(new JSFunction("RichFaces.NotifyStack.register",
RendererUtils.getInstance().clientId(context, component),
getOptions((AbstractNotifyStack) component)
), null);
- writer.endElement(HTML.SCRIPT_ELEM);
+ writer.endElement(HtmlConstants.SCRIPT_ELEM);
}
protected Map<String, Object> getOptions(AbstractNotifyStack stack) throws IOException {
Modified: sandbox/trunk/ui/schedule/bom/pom.xml
===================================================================
--- sandbox/trunk/ui/schedule/bom/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/bom/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -36,15 +36,15 @@
<packaging>pom</packaging>
<properties>
- <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version>
+ <org.richfaces.version>4.0.0-SNAPSHOT</org.richfaces.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces.ui.core</groupId>
- <artifactId>richfaces-ui-core-bom</artifactId>
- <version>${org.richfaces.core.version}</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${org.richfaces.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: sandbox/trunk/ui/schedule/demo/pom.xml
===================================================================
--- sandbox/trunk/ui/schedule/demo/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/demo/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.richfaces.ui.misc</groupId>
- <artifactId>functions-ui</artifactId>
+ <artifactId>richfaces-ui-misc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.ui.notify</groupId>
@@ -69,14 +69,6 @@
<artifactId>${jsf2.impl.artifactid}</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
</dependencies>
</project>
Modified: sandbox/trunk/ui/schedule/ui/pom.xml
===================================================================
--- sandbox/trunk/ui/schedule/ui/pom.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/pom.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -89,12 +89,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: sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractSchedule.java
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractSchedule.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractSchedule.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -21,22 +21,18 @@
*/
package org.richfaces.component;
-import org.ajax4jsf.component.AjaxComponent;
-import org.ajax4jsf.context.AjaxContext;
-import org.ajax4jsf.event.AjaxEvent;
-import org.ajax4jsf.model.DataVisitResult;
-import org.ajax4jsf.model.DataVisitor;
-import org.ajax4jsf.model.ExtendedDataModel;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.Description;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Signature;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.cdk.annotations.TagType;
-import org.richfaces.component.event.*;
-import org.richfaces.component.model.DateRange;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import javax.el.ELContext;
import javax.el.MethodExpression;
@@ -53,19 +49,37 @@
import javax.faces.model.ResultSetDataModel;
import javax.faces.model.ScalarDataModel;
import javax.servlet.jsp.jstl.sql.Result;
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import org.ajax4jsf.component.AjaxComponent;
+import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.model.DataVisitResult;
+import org.ajax4jsf.model.DataVisitor;
+import org.ajax4jsf.model.ExtendedDataModel;
+import org.richfaces.cdk.annotations.Attribute;
+import org.richfaces.cdk.annotations.Description;
+import org.richfaces.cdk.annotations.EventName;
+import org.richfaces.cdk.annotations.JsfComponent;
+import org.richfaces.cdk.annotations.JsfRenderer;
+import org.richfaces.cdk.annotations.Signature;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+import org.richfaces.component.event.ScheduleDateRangeChangeEvent;
+import org.richfaces.component.event.ScheduleDateRangeChangeListener;
+import org.richfaces.component.event.ScheduleDateRangeSelectEvent;
+import org.richfaces.component.event.ScheduleDateRangeSelectListener;
+import org.richfaces.component.event.ScheduleDateSelectEvent;
+import org.richfaces.component.event.ScheduleDateSelectListener;
+import org.richfaces.component.event.ScheduleItemMoveEvent;
+import org.richfaces.component.event.ScheduleItemMoveListener;
+import org.richfaces.component.event.ScheduleItemResizeEvent;
+import org.richfaces.component.event.ScheduleItemResizeListener;
+import org.richfaces.component.event.ScheduleItemSelectEvent;
+import org.richfaces.component.event.ScheduleItemSelectListener;
+import org.richfaces.component.event.ScheduleListenerEventsProducer;
+import org.richfaces.component.event.ScheduleViewChangeEvent;
+import org.richfaces.component.event.ScheduleViewChangeListener;
+import org.richfaces.component.model.DateRange;
+
/**
* Base class for generation of UISchedule component.
*
@@ -138,9 +152,9 @@
public abstract void setDate(Date date);
- @Attribute(defaultValue = DEFAULT_SWITCH_TYPE,
+ @Attribute(defaultValue = "SwitchType." + DEFAULT_SWITCH_TYPE,
suggestedValue = SWITCH_TYPE_AJAX + "," + SWITCH_TYPE_SERVER + "," + SWITCH_TYPE_CLIENT)
- public abstract String getSwitchType();
+ public abstract SwitchType getSwitchType();
@Attribute(defaultValue = DEFAULT_VIEW,
suggestedValue = VIEW_MONTH
@@ -322,6 +336,13 @@
@Attribute
public abstract String getWidgetVar();
+ private void setResponseData(Object data) {
+ FacesContext facesContext = getFacesContext();
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(facesContext);
+
+ ajaxContext.getResponseComponentDataMap().put(getClientId(facesContext), data);
+ }
+
/**
* React on various events.
* Vetoable events are first broadcasted to listeners bound via EL to
@@ -346,7 +367,6 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
if (event instanceof ScheduleDateRangeChangeEvent) {
super.broadcast(event);
- new AjaxEvent(this).queue();
ScheduleDateRangeChangeEvent calendarAjaxEvent = (ScheduleDateRangeChangeEvent) event;
FacesContext facesContext = getFacesContext();
MethodExpression expression = getDateRangeChangeListener();
@@ -354,7 +374,7 @@
expression.invoke(facesContext.getELContext(), new Object[]{event});
}
try {
- setData(getScheduleData(calendarAjaxEvent.getStartDate(), calendarAjaxEvent.getEndDate()));
+ setResponseData(getScheduleData(calendarAjaxEvent.getStartDate(), calendarAjaxEvent.getEndDate()));
} catch (IOException ex) {
getFacesContext().getExternalContext().log("Cannot get schedule data", ex);
}
@@ -366,9 +386,8 @@
Object result = expression.invoke(facesContext.getELContext(), new Object[]{event});
allow = (Boolean) result;
}
- setData(allow);
+ setResponseData(allow);
super.broadcast(event);
- new AjaxEvent(this).queue();
} else if (event instanceof ScheduleItemResizeEvent) {
FacesContext facesContext = getFacesContext();
MethodExpression expression = getItemResizeListener();
@@ -377,12 +396,10 @@
Object result = expression.invoke(facesContext.getELContext(), new Object[]{event});
allow = ((Boolean) result);
}
- setData(allow);
+ setResponseData(allow);
super.broadcast(event);
- new AjaxEvent(this).queue();
} else if (event instanceof ScheduleItemSelectEvent) {
super.broadcast(event);
- new AjaxEvent(this).queue();
FacesContext facesContext = getFacesContext();
MethodExpression expression = getItemSelectListener();
if (expression != null) {
@@ -390,7 +407,6 @@
}
} else if (event instanceof ScheduleViewChangeEvent) {
super.broadcast(event);
- new AjaxEvent(this).queue();
FacesContext facesContext = getFacesContext();
MethodExpression expression = getViewChangeListener();
if (expression != null) {
@@ -398,7 +414,6 @@
}
} else if (event instanceof ScheduleDateSelectEvent) {
super.broadcast(event);
- new AjaxEvent(this).queue();
FacesContext facesContext = getFacesContext();
MethodExpression expression = getDateSelectListener();
if (expression != null) {
@@ -406,37 +421,36 @@
}
} else if (event instanceof ScheduleDateRangeSelectEvent) {
super.broadcast(event);
- new AjaxEvent(this).queue();
FacesContext facesContext = getFacesContext();
MethodExpression expression = getDateRangeSelectListener();
if (expression != null) {
expression.invoke(facesContext.getELContext(), new Object[]{event});
}
- } else if (event instanceof AjaxEvent) {
- FacesContext context = getFacesContext();
- // complete re-Render fields. AjaxEvent deliver before render
- // response.
- AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this);
- // Put data for send in response
- Object data = getData();
- AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- if (null != data) {
- ajaxContext.setResponseData(data);
- }
- String focus = getFocus();
- if (null != focus) {
- // search for component in tree.
- // XXX - use more pourful search, as in h:outputLabel
- // component.
-// UIComponent focusComponent = RendererUtils.getInstance().
-// findComponentFor(this, focus);
-// if (null != focusComponent) {
-// focus = focusComponent.getClientId(context);
-// }
-// TODO put focus data here
-// ajaxContext.getResponseDataMap().put(AjaxActionComponent.FOCUS_DATA_ID, focus);
- }
- ajaxContext.setOncomplete(getOncomplete());
+// } else if (event instanceof AjaxEvent) {
+// FacesContext context = getFacesContext();
+// // complete re-Render fields. AjaxEvent deliver before render
+// // response.
+// AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this);
+// // Put data for send in response
+// Object data = getData();
+// AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+// if (null != data) {
+// ajaxContext.setResponseData(data);
+// }
+// String focus = getFocus();
+// if (null != focus) {
+// // search for component in tree.
+// // XXX - use more pourful search, as in h:outputLabel
+// // component.
+//// UIComponent focusComponent = RendererUtils.getInstance().
+//// findComponentFor(this, focus);
+//// if (null != focusComponent) {
+//// focus = focusComponent.getClientId(context);
+//// }
+//// TODO put focus data here
+//// ajaxContext.getResponseDataMap().put(AjaxActionComponent.FOCUS_DATA_ID, focus);
+// }
+// ajaxContext.setOncomplete(getOncomplete());
} else {
super.broadcast(event);
}
Modified: sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractScheduleItem.java
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractScheduleItem.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/component/AbstractScheduleItem.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -21,14 +21,15 @@
*/
package org.richfaces.component;
+import java.util.Date;
+
+import javax.faces.component.UIComponentBase;
+
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
-import javax.faces.component.UIComponentBase;
-import java.util.Date;
-
@JsfComponent(tag = @Tag(name = "scheduleItem", type = TagType.Facelets))
public abstract class AbstractScheduleItem extends UIComponentBase {
@@ -58,7 +59,7 @@
@Attribute
public abstract String getUrl();
- @Attribute
+ @Attribute(defaultValue = "false")
public abstract Boolean isEditable();
public abstract Object getData();
Modified: sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -1,12 +1,25 @@
package org.richfaces.renderkit;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.FacesException;
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UINamingContainer;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSObject;
import org.ajax4jsf.javascript.JSReference;
-import org.ajax4jsf.renderkit.AjaxEventOptions;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.AbstractSchedule;
import org.richfaces.component.AbstractScheduleAgendaDayView;
import org.richfaces.component.AbstractScheduleAgendaWeekView;
@@ -14,6 +27,7 @@
import org.richfaces.component.AbstractScheduleBasicWeekView;
import org.richfaces.component.AbstractScheduleMonthView;
import org.richfaces.component.ScheduleCommonViewAttributes;
+import org.richfaces.component.SwitchType;
import org.richfaces.component.event.ScheduleDateRangeChangeEvent;
import org.richfaces.component.event.ScheduleDateRangeSelectEvent;
import org.richfaces.component.event.ScheduleDateSelectEvent;
@@ -21,22 +35,9 @@
import org.richfaces.component.event.ScheduleItemResizeEvent;
import org.richfaces.component.event.ScheduleItemSelectEvent;
import org.richfaces.component.event.ScheduleViewChangeEvent;
+import org.richfaces.renderkit.util.AjaxRendererUtils;
+import org.richfaces.renderkit.util.RendererUtils;
-import javax.faces.FacesException;
-import javax.faces.application.ResourceDependencies;
-import javax.faces.application.ResourceDependency;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UINamingContainer;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
@ResourceDependencies({
@ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "jquery.js", target = "head"),
@@ -365,13 +366,13 @@
}
protected boolean isAjaxMode(AbstractSchedule component) {
- String mode = component.getSwitchType();
- return AbstractSchedule.SWITCH_TYPE_AJAX.equals(mode) || "".equals(mode) || null == mode;
+ SwitchType mode = component.getSwitchType();
+ return SwitchType.ajax.equals(mode) || null == mode;
}
protected boolean isClientMode(AbstractSchedule component) {
- String mode = component.getSwitchType();
- return AbstractSchedule.SWITCH_TYPE_CLIENT.equals(mode);
+ SwitchType mode = component.getSwitchType();
+ return SwitchType.client.equals(mode);
}
private void addOptionHash(String attribute, UIComponent source, Map<String, Object> options) {
Modified: sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java 2010-11-10 13:17:12 UTC (rev 20010)
@@ -1,13 +1,5 @@
package org.richfaces.renderkit.html.scripts;
-import org.ajax4jsf.renderkit.RendererUtils;
-import org.richfaces.resource.AbstractCacheableResource;
-import org.richfaces.resource.DynamicResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -17,15 +9,24 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
+
+import org.richfaces.log.LogFactory;
+import org.richfaces.log.Logger;
+import org.richfaces.renderkit.HtmlConstants;
+import org.richfaces.resource.AbstractCacheableResource;
+import org.richfaces.resource.DynamicResource;
+
@DynamicResource
public class ScheduleMessages extends AbstractCacheableResource {
public static final String BUNDLE_NAME = "org.richfaces.component.UIScheduleMessages";
private static final String MESSAGE_KEY_BASE = "org.richfaces.component.UISchedule.";
- private static final Logger LOG = LoggerFactory.getLogger(ScheduleMessages.class);
+ private static final Logger LOG = LogFactory.getLogger(ScheduleMessages.class);
public ScheduleMessages() {
- setContentType(RendererUtils.HTML.JAVASCRIPT_TYPE);
+ setContentType(HtmlConstants.JAVASCRIPT_TYPE);
}
@Override
Modified: sandbox/trunk/ui/schedule/ui/src/main/resources/META-INF/resources/richfaces.schedule.js
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/resources/META-INF/resources/richfaces.schedule.js 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/resources/META-INF/resources/richfaces.schedule.js 2010-11-10 13:17:12 UTC (rev 20010)
@@ -4,8 +4,7 @@
var _this = this;
this.scheduleNode = document.getElementById(id);
- this.scheduleNode.richfaces = {};
- this.scheduleNode.richfaces.component = this;
+ this.scheduleNode[RichFaces.RICH_CONTAINER] = {component: this};
if (!this.scheduleNode) {
throw "No element with id '" + id + "' found.";
}
@@ -24,6 +23,10 @@
/**
* Utility functions.
*/
+ var getResponseData = function(event) {
+ return event.componentData[id];
+ }
+
// ---
/**
* Converts javascript date into integer that can be used as param
@@ -90,7 +93,8 @@
formatDateParam(startDate),
formatDateParam(endDate),
null, null, null,
- function(event, data) {
+ function(event) {
+ var data = getResponseData(event);
if (data != undefined) {
callback(data);
}
@@ -169,7 +173,9 @@
null,
null,
dayDelta, minuteDelta, allDay,
- function(event, decision) {
+ function(event) {
+ var decision = getResponseData(event);
+
var vetoed = false;
if (decision != undefined && decision !== true) {
revertFunc();
@@ -249,7 +255,8 @@
null,
null,
dayDelta, minuteDelta, null,
- function(event, decision) {
+ function(event) {
+ var decision = getResponseData(event);
var vetoed = false;
if (decision != undefined && decision !== true) {
revertFunc();
@@ -319,7 +326,9 @@
null,
itemSelectEventName,
item.id,
- null, null, null, null, null, function(event, data) {
+ null, null, null, null, null, function(event) {
+ var data = getResponseData(event);
+
if (options.onitemselect != null) {
RichFaces.Schedule.eval("(function(){" + options.onitemselect + "})()", {
'item':item,
@@ -354,7 +363,8 @@
submitEventFunction(event,
null,
dateSelectEventName,
- null, formatDateParam(date), null, null, null, allDay, function(event, data) {
+ null, formatDateParam(date), null, null, null, allDay, function(event) {
+ var data = getResponseData(event);
if (options.ondateselect != null) {
RichFaces.Schedule.eval("(function(){" + options.ondateselect + "})()", {
'date':date,
@@ -383,7 +393,8 @@
submitEventFunction({},
view.name,
viewChangeEventName,
- null, null, null, null, null, null, function(event, data) {
+ null, null, null, null, null, null, function(event) {
+ var data = getResponseData(event);
if (options.onviewchange != null) {
RichFaces.Schedule.eval("(function(){" + options.onviewchange + "})()", {
'view':view,
@@ -433,7 +444,8 @@
null,
dateRangeSelectEventName,
null, formatDateParam(startDate), formatDateParam(endDate), null, null, allDay,
- function(event, data) {
+ function(event) {
+ var data = getResponseData(event);
_this.refetchItems();
if (options.ondaterangeselect != null) {
RichFaces.Schedule.eval("(function(){" + options.ondaterangeselect + "})()", {
Modified: sandbox/trunk/ui/schedule/ui/src/main/templates/org/richfaces/schedule.template.xml
===================================================================
--- sandbox/trunk/ui/schedule/ui/src/main/templates/org/richfaces/schedule.template.xml 2010-11-10 11:29:26 UTC (rev 20009)
+++ sandbox/trunk/ui/schedule/ui/src/main/templates/org/richfaces/schedule.template.xml 2010-11-10 13:17:12 UTC (rev 20010)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el"
+<cdk:root xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:cdk="http://richfaces.org/cdk/core"
- xmlns:c="http://richfaces.org/cdk/jstl/core"
- xmlns:cc="http://richfaces.org/cdk/jsf/composite"
+ xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core"
+ xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core"
+ xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"
xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
@@ -17,7 +17,7 @@
<cc:implementation>
<cdk:call
- expression="org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, component);"/>
+ expression="org.richfaces.renderkit.util.FormUtil.throwEnclFormReqExceptionIfNeed(facesContext, component);"/>
<div id="#{clientId}" class="rich-schedule #{component.attributes['styleClass']}"/>
<script type="text/javascript">
<cdk:call expression="writeInitFunction(facesContext,component);"/>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20009 - in modules/tests/metamer/trunk/application: src/main/java/org/richfaces/tests/metamer and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-11-10 06:29:26 -0500 (Wed, 10 Nov 2010)
New Revision: 20009
Modified:
modules/tests/metamer/trunk/application/
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java
modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
Log:
* method isBoolen() renamed to isBool() because of Tomcat 7
Property changes on: modules/tests/metamer/trunk/application
___________________________________________________________________
Name: svn:ignore
- .checkstyle
.classpath
.project
.settings
target
nbactions.xml
nb-configuration.xml
.pom.xml.swp
+ .checkstyle
.classpath
.project
.settings
target
nbactions.xml
nb-configuration.xml
.pom.xml.swp
profiles.xml
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2010-11-10 04:39:44 UTC (rev 20008)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attribute.java 2010-11-10 11:29:26 UTC (rev 20009)
@@ -112,7 +112,7 @@
this.type = type;
}
- public boolean isBoolean() {
+ public boolean isBool() {
return type == Boolean.class || type == boolean.class;
}
Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2010-11-10 04:39:44 UTC (rev 20008)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/metamer/attributes.xhtml 2010-11-10 11:29:26 UTC (rev 20009)
@@ -31,7 +31,7 @@
</h:panelGroup>
<c:choose>
- <c:when test="#{entry.value.boolean}">
+ <c:when test="#{entry.value.bool}">
<h:selectOneRadio id="#{entry.key}Input" value="#{entry.value.value}" onchange="#{cc.attrs.type == 'server' ? 'submit()' : 'submitAjax()'}">
<f:selectItem itemValue="null" itemLabel="null"/>
<f:selectItem itemValue="true" itemLabel="true"/>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20008 - in modules/docs/trunk: Component_Reference/src/main/docbook/en-US/extras and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-11-09 23:39:44 -0500 (Tue, 09 Nov 2010)
New Revision: 20008
Added:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselect-Selection_items.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richselect-richselect.png
Removed:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richselectOne-richselectOne.png
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Changes_and_new_features.xml
Log:
Corrected selectOne to select
Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-11-10 00:18:48 UTC (rev 20007)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2010-11-10 04:39:44 UTC (rev 20008)
@@ -818,45 +818,45 @@
</section>
</section>
- <!-- <rich:selectOne> -->
- <section id="sect-Component_Reference-Rich_inputs-richselectOne">
- <title><sgmltag><rich:selectOne></sgmltag></title>
+ <!-- <rich:select> -->
+ <section id="sect-Component_Reference-Rich_inputs-richselect">
+ <title><sgmltag><rich:select></sgmltag></title>
<para>
- The <sgmltag><rich:selectOne></sgmltag> component provides a drop-down list box for selecting a single value from multiple options. The component supports keyboard navigation and can optionally accept typed input as a combo-box.
+ The <sgmltag><rich:select></sgmltag> component provides a drop-down list box for selecting a single value from multiple options. The component supports keyboard navigation and can optionally accept typed input as a combo-box.
</para>
- <figure id="figu-Component_Reference-richselectOne-richselectOne">
- <title><sgmltag><rich:selectOne></sgmltag></title>
+ <figure id="figu-Component_Reference-richselect-richselect">
+ <title><sgmltag><rich:select></sgmltag></title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/figu-Component_Reference-richselectOne-richselectOne.png" format="PNG" />
+ <imagedata fileref="images/figu-Component_Reference-richselect-richselect.png" format="PNG" />
</imageobject>
<textobject>
<para>
- A <sgmltag><rich:selectOne></sgmltag> component used as a combo-box.
+ A <sgmltag><rich:select></sgmltag> component used as a combo-box.
</para>
</textobject>
</mediaobject>
</figure>
- <section id="sect-Component_Reference-richselectOne-Basic_usage">
+ <section id="sect-Component_Reference-richselect-Basic_usage">
<title>Basic usage</title>
<para>
- Simple usage of the <sgmltag><rich:selectOne></sgmltag> component does not need any attributes declared, but child tags to manage the list of selections are required. An <sgmltag><f:selectItem></sgmltag> tag manages the currently selected value, while an <sgmltag><f:selectItems></sgmltag> tag points to the list of selection items.
+ Simple usage of the <sgmltag><rich:select></sgmltag> component does not need any attributes declared, but child tags to manage the list of selections are required. An <sgmltag><f:selectItem></sgmltag> tag manages the currently selected value, while an <sgmltag><f:selectItems></sgmltag> tag points to the list of selection items.
</para>
- <example id="exam-Component_Reference-richselectOne-Selection_items">
+ <example id="exam-Component_Reference-richselect-Selection_items">
<title>Selection items</title>
- <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richselect-Selection_items.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
</example>
<para>
The arrow keys on a keyboard can be used to highlight different items in the list, even if the list is closed with the control still focused. If the control loses focus or the <keycap function="enter">Enter</keycap> key is pressed, the highlighted option is chosen as the value and the list is closed. Pressing the <keycap function="escape">Esc</keycap> key will close the list but not change the value.
</para>
</section>
- <section id="sect-Component_Reference-richselectOne-Using_richselectOne_as_a_combo-box">
- <title>Using <sgmltag><rich:selectOne></sgmltag> as a combo-box</title>
+ <section id="sect-Component_Reference-richselect-Using_richselect_as_a_combo-box">
+ <title>Using <sgmltag><rich:select></sgmltag> as a combo-box</title>
<para>
- Combo-boxes are drop-down lists that allow the user to type into a text field to scroll through or filter the list. By default, the <sgmltag><rich:selectOne></sgmltag> component functions as a drop-down list. To add keyboard support to make it function like a combo-box, set <code>enableManualInput="true"</code>.
+ Combo-boxes are drop-down lists that allow the user to type into a text field to scroll through or filter the list. By default, the <sgmltag><rich:select></sgmltag> component functions as a drop-down list. To add keyboard support to make it function like a combo-box, set <code>enableManualInput="true"</code>.
</para>
<para>
Once the user begins typing, the first available matching option is highlighted. If the typed text does not match any values in the list, no value is chosen and the drop-down list displays as empty. Other keyboard interaction remains the same as the basic drop-down list.
@@ -866,32 +866,32 @@
</para>
</section>
- <section id="sect-Component_Reference-richselectOne-Reference_data">
+ <section id="sect-Component_Reference-richselect-Reference_data">
<title>Reference data</title>
<itemizedlist>
<listitem>
<para>
- <parameter>component-type</parameter>: <classname>org.richfaces.selectOne</classname>
+ <parameter>component-type</parameter>: <classname>org.richfaces.select</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlSelectOne</classname>
+ <parameter>component-class</parameter>: <classname>org.richfaces.component.html.HtmlSelect</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>component-family</parameter>: <classname>org.richfaces.selectOne</classname>
+ <parameter>component-family</parameter>: <classname>org.richfaces.select</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.selectOneRenderer</classname>
+ <parameter>renderer-type</parameter>: <classname>org.richfaces.renderkit.selectRenderer</classname>
</para>
</listitem>
<listitem>
<para>
- <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.selectOneTag</classname>
+ <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.selectTag</classname>
</para>
</listitem>
</itemizedlist>
Copied: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselect-Selection_items.xml_sample (from rev 20007, modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample)
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselect-Selection_items.xml_sample (rev 0)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselect-Selection_items.xml_sample 2010-11-10 04:39:44 UTC (rev 20008)
@@ -0,0 +1,4 @@
+<rich:select>
+ <f:selectItem itemLabel="constantOption" itemValue="0">
+ <f:selectItems="#{bean.items}">
+</rich:select>
Deleted: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample
===================================================================
--- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample 2010-11-10 00:18:48 UTC (rev 20007)
+++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richselectOne-Selection_items.xml_sample 2010-11-10 04:39:44 UTC (rev 20008)
@@ -1,4 +0,0 @@
-<rich:selectOne>
- <f:selectItem itemLabel="constantOption" itemValue="0">
- <f:selectItems="#{bean.items}">
-</rich:selectOne>
Copied: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richselect-richselect.png (from rev 20007, modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richselectOne-richselectOne.png)
===================================================================
(Binary files differ)
Deleted: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/figu-Component_Reference-richselectOne-richselectOne.png
===================================================================
(Binary files differ)
Modified: modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Changes_and_new_features.xml
===================================================================
--- modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Changes_and_new_features.xml 2010-11-10 00:18:48 UTC (rev 20007)
+++ modules/docs/trunk/Migration_Guide/src/main/docbook/en-US/Changes_and_new_features.xml 2010-11-10 04:39:44 UTC (rev 20008)
@@ -994,10 +994,10 @@
</para>
</section>
- <section id="sect-Migration_Guide-Consolidated_or_renamed_components-richselectOne">
- <title><sgmltag><rich:selectOne></sgmltag></title>
+ <section id="sect-Migration_Guide-Consolidated_or_renamed_components-richselect">
+ <title><sgmltag><rich:select></sgmltag></title>
<para>
- The <sgmltag><rich:selectOne></sgmltag> component replaces the old <sgmltag><rich:comboBox></sgmltag> component.
+ The <sgmltag><rich:select></sgmltag> component replaces the old <sgmltag><rich:comboBox></sgmltag> component.
</para>
</section>
@@ -1047,7 +1047,7 @@
<section id="sect-Migration_Guide-Deprecated_components_and_behaviors-richcomboBox">
<title><sgmltag><rich:comboBox></sgmltag></title>
<para>
- The functionality of the old <sgmltag><rich:comboBox></sgmltag> component is now available through the <sgmltag><rich:selectOne></sgmltag> component.
+ The functionality of the old <sgmltag><rich:comboBox></sgmltag> component is now available through the <sgmltag><rich:select></sgmltag> component.
</para>
</section>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20007 - in modules/build/resources/trunk: github and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-11-09 19:18:48 -0500 (Tue, 09 Nov 2010)
New Revision: 20007
Added:
modules/build/resources/trunk/github/
modules/build/resources/trunk/github/richfaces-svn2git.sh
modules/build/resources/trunk/github/svn.authors
Log:
git migration script
Added: modules/build/resources/trunk/github/richfaces-svn2git.sh
===================================================================
--- modules/build/resources/trunk/github/richfaces-svn2git.sh (rev 0)
+++ modules/build/resources/trunk/github/richfaces-svn2git.sh 2010-11-10 00:18:48 UTC (rev 20007)
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Program locations
+xmlstarlet=/usr/bin/xmlstarlet
+git=/usr/bin/git
+
+phase1_dir=import-phase1
+phase2_dir=import-phase2
+svnroot=http://anonsvn.jboss.org/repos/richfaces/
+svnauthors=$(dirname $0)/svn.authors
+get_resources=1
+get_parent=1
+get_docs=1
+get_main=1
+publish=0
+ignore_paths="^(?:3.*|archive|tests)"
+
+fix_tags()
+{
+ # Convert svn remote tags to lightweight git tags
+ $git for-each-ref --format='%(refname)' refs/remotes/tags/* | while read tag_ref; do
+ tag=${tag_ref#refs/remotes/tags/}
+ tree=$( $git rev-parse "$tag_ref": )
+
+ # find the oldest ancestor for which the tree is the same
+ parent_ref="$tag_ref";
+ while [ $( $git rev-parse --quiet --verify "$parent_ref"^: ) = "$tree" ]; do
+ parent_ref="$parent_ref"^
+ done
+ parent=$( $git rev-parse "$parent_ref" );
+
+ # if this ancestor is in trunk then we can just tag it
+ # otherwise the tag has diverged from trunk and it's actually more like a
+ # branch than a tag
+ merge=$( $git merge-base "refs/remotes/trunk" $parent );
+ if [ "$merge" = "$parent" ]; then
+ target_ref=$parent
+ else
+ echo "tag has diverged: $tag"
+ target_ref="$tag_ref"
+ fi
+ target_ref=$parent
+
+ tag_name=$( $git log -1 --pretty="format:%an" "$tag_ref" )
+ tag_email=$( $git log -1 --pretty="format:%ae" "$tag_ref" )
+ tag_date=$( $git log -1 --pretty="format:%ai" "$tag_ref" )
+ $git log -1 --pretty='format:%s' "$tag_ref" | GIT_COMMITTER_NAME="$tag_name" GIT_COMMITTER_EMAIL="$tag_email" GIT_COMMITTER_DATE="$tag_date" $git tag -a -F - "$tag" "$target_ref"
+
+ $git update-ref -d "$tag_ref"
+ done
+}
+
+fetch_svn()
+{
+ mkdir -p $1
+ cd $1
+ $git svn init ${svnroot}${2} --no-metadata --no-minimize-url --trunk=trunk --tags=tags
+ $git config svn.authorsfile ${svnauthors}
+ if [[ "x${3}x" -ne "xx" ]]; then
+ startrev=${3}
+ else
+ startrev=$(svn log --stop-on-copy ${svnroot}trunk -q | tail -2 | head -1 | awk '{print substr($1,2)}')
+ fi
+ headrev=$(svn info ${svnroot}${2}trunk | awk '/^Revision/ {print $2}')
+ $git svn fetch --ignore-paths=${ignore_paths} --revision=${startrev}:${headrev}
+ fix_tags
+ $git gc
+ cd ..
+}
+mkdir -p $phase1_dir
+cd $phase1_dir
+
+if [[ $get_parent -eq 1 ]]; then
+ fetch_svn parent modules/build/parent/
+fi
+
+if [[ $get_main -eq 1 ]]; then
+ startrev=$(svn log --stop-on-copy ${svnroot}trunk -q | tail -2 | head -1 | awk '{print substr($1,2)}')
+ fetch_svn main "" ${startrev}
+fi
+
+if [[ $get_docs -eq 1 ]]; then
+ fetch_svn docs modules/docs/
+fi
+
+if [[ $get_resources -eq 1 ]]; then
+ fetch_svn resources modules/build/resources
+fi
+
+cd ..
+
+mkdir -p $phase2_dir
+cd $phase2_dir
+
+if [[ $publish -eq 1 ]]; then
+ if [[ $get_parent -eq 1 ]]; then
+ $git clone ../$phase1_dir/parent
+ cd parent
+ $git remote add github git@github.com:seam/parent.git
+ $git remote -v
+ cd ..
+ fi
+fi
Property changes on: modules/build/resources/trunk/github/richfaces-svn2git.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: modules/build/resources/trunk/github/svn.authors
===================================================================
--- modules/build/resources/trunk/github/svn.authors (rev 0)
+++ modules/build/resources/trunk/github/svn.authors 2010-11-10 00:18:48 UTC (rev 20007)
@@ -0,0 +1,5 @@
+# SVN Login = git.user <git.email>
+
+(no author) = No Author <null@localhost>
+alexsmirnov = Alexander Smirnov <asmirnov(a)exadel.com>
+jbalunas(a)redhat.com = Jay Balunas <jbalunas(a)redhat.com>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20006 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-09 16:53:20 -0500 (Tue, 09 Nov 2010)
New Revision: 20006
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
Log:
https://jira.jboss.org/browse/RF-9738
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2010-11-09 18:55:12 UTC (rev 20005)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2010-11-09 21:53:20 UTC (rev 20006)
@@ -44,7 +44,7 @@
converterMessage="#{richInplaceSelectBean.attributes['converterMessage'].value}"
defaultLabel="#{richInplaceSelectBean.attributes['defaultLabel'].value}"
editEvent="#{richInplaceSelectBean.attributes['editEvent'].value}"
- enableManualInput="#{richInplaceSelectBean.attributes['editManualInput'].value}"
+ enableManualInput="#{richInplaceSelectBean.attributes['enableManualInput'].value}"
immediate="#{richInplaceSelectBean.attributes['immediate'].value}"
itemClass="#{richInplaceSelectBean.attributes['itemClass'].value}"
listClass="#{richInplaceSelectBean.attributes['listClass'].value}"
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r20005 - modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-09 13:55:12 -0500 (Tue, 09 Nov 2010)
New Revision: 20005
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
Log:
https://jira.jboss.org/browse/RF-9747
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2010-11-09 17:46:25 UTC (rev 20004)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richJQuery/simple.xhtml 2010-11-09 18:55:12 UTC (rev 20005)
@@ -74,7 +74,7 @@
</ui:repeat>
</h:panelGroup>
- <rich:jQuery id="liveTestJQuery" selector="#liveTestGroup .liveTestComponent" attachType="live" event="click" query="alert(jQuery(this).text().trim())" />
+ <rich:jQuery id="liveTestJQuery" selector="#liveTestGroup .liveTestComponent" attachType="live" event="click" query="alert(jQuery.trim(jQuery(this).text()))" />
<br/>
13 years, 7 months
- 1
- 0