JBoss Rich Faces SVN: r2046 - trunk/ui/message/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-03 09:18:12 -0400 (Fri, 03 Aug 2007)
New Revision: 2046
Modified:
trunk/ui/message/src/main/config/component/message.xml
Log:
remove default label 'passed'
Modified: trunk/ui/message/src/main/config/component/message.xml
===================================================================
--- trunk/ui/message/src/main/config/component/message.xml 2007-08-03 12:40:26 UTC (rev 2045)
+++ trunk/ui/message/src/main/config/component/message.xml 2007-08-03 13:18:12 UTC (rev 2046)
@@ -40,7 +40,6 @@
<property attachedstate="true">
<name>passedLabel</name>
<classname>java.lang.String</classname>
- <defaultvalue>"passed"</defaultvalue>
<description>
Attribute should define the label to be displayed when no message appears
</description>
16 years, 9 months
JBoss Rich Faces SVN: r2045 - in trunk/ui/message/src/main: java/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-03 08:40:26 -0400 (Fri, 03 Aug 2007)
New Revision: 2045
Modified:
trunk/ui/message/src/main/config/component/message.xml
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
fix RF-536, remove logInfo
Modified: trunk/ui/message/src/main/config/component/message.xml
===================================================================
--- trunk/ui/message/src/main/config/component/message.xml 2007-08-03 12:38:23 UTC (rev 2044)
+++ trunk/ui/message/src/main/config/component/message.xml 2007-08-03 12:40:26 UTC (rev 2045)
@@ -219,7 +219,6 @@
<property attachedstate="true">
<name>passedLabel</name>
<classname>java.lang.String</classname>
- <defaultvalue>"passed"</defaultvalue>
<description>
Attribute should define the label to be displayed when no message appears
</description>
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-03 12:38:23 UTC (rev 2044)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-03 12:40:26 UTC (rev 2045)
@@ -76,8 +76,8 @@
if(forClientId == null){
- if(log.isInfoEnabled()){
- log.info(NULL_PARAMETER_ERROR_MESSAGE);
+ if(log.isErrorEnabled()){
+ log.error(NULL_PARAMETER_ERROR_MESSAGE);
}
}else{
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-03 12:38:23 UTC (rev 2044)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-03 12:40:26 UTC (rev 2045)
@@ -148,10 +148,6 @@
}
- if(log.isInfoEnabled()){
- log.info("start render messages");
- }
-
if(!messagesIter.hasNext()){
renderBody(uiMessages, context, writer, null);
@@ -173,11 +169,6 @@
requestMap.put(var, facesMsg);
try {
-
- if(log.isInfoEnabled()){
- log.info("start render children of " + uiMessages.getClientId(context) + " component");
- }
-
renderChildren(context, uiMessages);
} finally {
@@ -226,10 +217,6 @@
uiMessages = (UIRichMessages)component;
- if(log.isInfoEnabled()){
- log.info("start render label HTML");
- }
-
boolean isTooltip = getUtils().isBooleanAttribute(uiMessages, "tooltip");
boolean showSummary = uiMessages.isShowSummary();
@@ -300,10 +287,6 @@
return;
}
- if(log.isInfoEnabled()){
- log.info("start render marker HTML: " + markerFacet.getClientId(context));
- }
-
uiMessages = (UIRichMessages)component;
if(isWroteTable){
@@ -336,10 +319,6 @@
uiMessages = (UIRichMessages)component;
- if(log.isInfoEnabled()){
- log.info("start render component outer styles: " + uiMessages.getClientId(context));
- }
-
String parentStyle = (String)uiMessages.getAttributes().get("style");
String parentClass = (String)uiMessages.getAttributes().get("styleClass");
16 years, 9 months
JBoss Rich Faces SVN: r2044 - in trunk/samples/rich-message-demo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-03 08:38:23 -0400 (Fri, 03 Aug 2007)
New Revision: 2044
Modified:
trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/SelectValidator.java
trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml
Log:
fix demo
Modified: trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/SelectValidator.java
===================================================================
--- trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/SelectValidator.java 2007-08-03 08:14:27 UTC (rev 2043)
+++ trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/SelectValidator.java 2007-08-03 12:38:23 UTC (rev 2044)
@@ -16,12 +16,12 @@
String selectedValue = (String) value;
String clientId = component.getClientId(context);
-
+ int componentNum = componentNum(component.getId());
if(selectedValue.equals("warn")){
FacesMessage message = new FacesMessage();
- message.setSummary("warning SUMMARY");
- message.setDetail("warning DETAIL");
+ message.setSummary("warning SUMMARY for: " + componentNum + " input");
+ message.setDetail("warning DETAIL for: " + componentNum + " input");
message.setSeverity(FacesMessage.SEVERITY_WARN);
context.addMessage(clientId, message);
@@ -29,8 +29,8 @@
}else if(selectedValue.equals("error")){
FacesMessage message = new FacesMessage();
- message.setSummary("error SUMMARY");
- message.setDetail("error DETAIL");
+ message.setSummary("error SUMMARY for: " + componentNum + " input");
+ message.setDetail("error DETAIL for: " + componentNum + " input");
message.setSeverity(FacesMessage.SEVERITY_ERROR);
context.addMessage(clientId, message);
@@ -38,8 +38,8 @@
}else if(selectedValue.equals("info")){
FacesMessage message = new FacesMessage();
- message.setSummary("info SUMMARY");
- message.setDetail("info DETAIL");
+ message.setSummary("info SUMMARY for: " + componentNum + " input");
+ message.setDetail("info DETAIL for: " + componentNum + " input");
message.setSeverity(FacesMessage.SEVERITY_INFO);
context.addMessage(clientId, message);
@@ -47,12 +47,26 @@
}else if(selectedValue.equals("fatal")){
FacesMessage message = new FacesMessage();
- message.setSummary("fatal SUMMARY");
- message.setDetail("fatal DETAIL");
+ message.setSummary("fatal SUMMARY for: " + componentNum + " input");
+ message.setDetail("fatal DETAIL for:" + componentNum + " input");
message.setSeverity(FacesMessage.SEVERITY_FATAL);
context.addMessage(clientId, message);
}
}
-
+
+ public int componentNum(String baseId){
+
+ if(baseId.endsWith("1")){
+ return 1;
+ }else if(baseId.endsWith("2")){
+ return 2;
+ }else if (baseId.endsWith("3")){
+ return 3;
+ }else if(baseId.endsWith("4")){
+ return 4;
+ }
+
+ return -1;
+ }
}
Modified: trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml
===================================================================
--- trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-08-03 08:14:27 UTC (rev 2043)
+++ trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo.xhtml 2007-08-03 12:38:23 UTC (rev 2044)
@@ -12,9 +12,9 @@
<h:form>
- <table>
- <tbody>
- <tr>
+ <table cellpadding="2" cellspacing="2">
+ <tr>
+ <td> <h:outputText value="1."/> </td>
<td>
<h:selectOneMenu id="select1" value="">
<f:selectItem itemValue="error" itemLabel="error"/>
@@ -27,6 +27,7 @@
</td>
</tr>
<tr>
+ <td> <h:outputText value="2."/> </td>
<td>
<h:selectOneMenu id="select2" value="">
<f:selectItem itemValue="error" itemLabel="error"/>
@@ -40,6 +41,7 @@
</tr>
<tr>
+ <td> <h:outputText value="3."/> </td>
<td>
<h:selectOneMenu id="select3" value="">
<f:selectItem itemValue="error" itemLabel="error"/>
@@ -51,8 +53,9 @@
</h:selectOneMenu>
</td>
</tr>
-
+
<tr>
+ <td> <h:outputText value="4."/> </td>
<td>
<h:selectOneMenu id="select4" value="">
<f:selectItem itemValue="error" itemLabel="error"/>
@@ -64,11 +67,13 @@
</h:selectOneMenu>
</td>
</tr>
-
- <tr>
- <td> <h:outputText value="Rich Message Demo"/> </td>
- </tr>
-
+ </table>
+
+ <table>
+ <tr>
+ <td> <h:outputText value="Rich Message Demo"/> </td>
+ </tr>
+
<tr>
<td>
<r:message for="select1"
@@ -106,44 +111,42 @@
</r:message>
</td>
</tr>
-
- </tbody>
- </table>
+ </table>
<table>
<tr>
- <td>
- <h:outputText value="Rich Messages Demo"/>
- </td>
- </tr>
-
- <tr>
- <td>
- <r:messages layout="list"
- tooltip="true"
- showDetail="false"
- showSummary="true"
- passedLabel="No Error"
- errorLabelClass="errorLabel"
- fatalLabelClass="warnLabel"
- infoLabelClass="infoLabel"
- warnLabelClass="fatalLabel"
- warnMarkerClass="markerWarn"
- infoMarkerClass="markerInfo"
- errorMarkerClass="markerError"
- fatalMarkerClass="markerFatal"
- errorClass="errorClass"
- fatalClass="fatalClass"
- warnClass="warnClass"
- infoClass="infoClass"
- labelClass="labelClass"
- var="messages"
- styleClass="class"
- >
- <f:facet name="errorMarker">
- <h:graphicImage url="/image/error.gif"/>
- </f:facet>
+ <td>
+ <h:outputText value="Rich Messages Demo"/>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <r:messages layout="table"
+ tooltip="true"
+ showDetail="false"
+ showSummary="true"
+ passedLabel="No Error"
+ errorLabelClass="errorLabel"
+ fatalLabelClass="warnLabel"
+ infoLabelClass="infoLabel"
+ warnLabelClass="fatalLabel"
+ warnMarkerClass="markerWarn"
+ infoMarkerClass="markerInfo"
+ errorMarkerClass="markerError"
+ fatalMarkerClass="markerFatal"
+ errorClass="errorClass"
+ fatalClass="fatalClass"
+ warnClass="warnClass"
+ infoClass="infoClass"
+ labelClass="labelClass"
+ var="messages"
+ styleClass="class"
+ >
+ <f:facet name="errorMarker">
+ <h:graphicImage url="/image/error.gif"/>
+ </f:facet>
<f:facet name="fatalMarker">
<h:graphicImage url="/image/fatal.gif"/>
</f:facet>
@@ -157,9 +160,9 @@
<h:graphicImage url="/image/passed.gif"/>
</f:facet>
<h:outputText value="#{messages.summary}"> </h:outputText>
- </r:messages>
- </td>
- </tr>
+ </r:messages>
+ </td>
+ </tr>
</table>
<div>
16 years, 9 months
JBoss Rich Faces SVN: r2043 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-03 04:14:27 -0400 (Fri, 03 Aug 2007)
New Revision: 2043
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
Log:
small optimization
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-03 02:13:23 UTC (rev 2042)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-03 08:14:27 UTC (rev 2043)
@@ -46,8 +46,9 @@
},
restoreSelection: function() {
- if (this.tree.input.value && $(this.tree.input.value)) {
- this.setSelection(($(this.tree.input.value)).object);
+ var e = $(this.tree.input.value);
+ if (this.tree.input.value && e) {
+ this.setSelection((e).object);
}
},
16 years, 9 months
JBoss Rich Faces SVN: r2042 - in trunk/samples/local-value-demo: src/main/webapp/WEB-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ishabalov
Date: 2007-08-02 22:13:23 -0400 (Thu, 02 Aug 2007)
New Revision: 2042
Modified:
trunk/samples/local-value-demo/pom.xml
trunk/samples/local-value-demo/src/main/webapp/WEB-INF/web.xml
trunk/samples/local-value-demo/src/main/webapp/css/common.css
trunk/samples/local-value-demo/src/main/webapp/pages/local-value-demo.xhtml
Log:
Final version
Modified: trunk/samples/local-value-demo/pom.xml
===================================================================
--- trunk/samples/local-value-demo/pom.xml 2007-08-03 01:28:53 UTC (rev 2041)
+++ trunk/samples/local-value-demo/pom.xml 2007-08-03 02:13:23 UTC (rev 2042)
@@ -9,7 +9,7 @@
<artifactId>local-value-demo</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>local-value-demo Maven Webapp</name>
+ <name>richfaces-local-value-demo Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
@@ -24,6 +24,6 @@
</dependency>
</dependencies>
<build>
- <finalName>local-value-demo</finalName>
+ <finalName>richfaces-local-value-demo</finalName>
</build>
</project>
Modified: trunk/samples/local-value-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/local-value-demo/src/main/webapp/WEB-INF/web.xml 2007-08-03 01:28:53 UTC (rev 2041)
+++ trunk/samples/local-value-demo/src/main/webapp/WEB-INF/web.xml 2007-08-03 02:13:23 UTC (rev 2042)
@@ -2,7 +2,7 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<description>Local Value demo</description>
- <display-name>local-value-demo</display-name>
+ <display-name>richfaces-local-value-demo</display-name>
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
Modified: trunk/samples/local-value-demo/src/main/webapp/css/common.css
===================================================================
--- trunk/samples/local-value-demo/src/main/webapp/css/common.css 2007-08-03 01:28:53 UTC (rev 2041)
+++ trunk/samples/local-value-demo/src/main/webapp/css/common.css 2007-08-03 02:13:23 UTC (rev 2042)
@@ -1,3 +1,7 @@
+.rich-panel {
+ margin-bottom: 5px;
+ margin-top: 5px;
+}
.samples {
vertical-align: top;
}
@@ -11,7 +15,7 @@
margin-left: 30px;
margin-right: 30px;
padding: 10px;
- background-color: #FFFF92;
+ background-color: #FFFFC5;
border-color: #A7A700;
}
.legend {
Modified: trunk/samples/local-value-demo/src/main/webapp/pages/local-value-demo.xhtml
===================================================================
--- trunk/samples/local-value-demo/src/main/webapp/pages/local-value-demo.xhtml 2007-08-03 01:28:53 UTC (rev 2041)
+++ trunk/samples/local-value-demo/src/main/webapp/pages/local-value-demo.xhtml 2007-08-03 02:13:23 UTC (rev 2042)
@@ -19,7 +19,7 @@
</head>
<body>
<a4j:loadStyle src="/css/common.css" />
-<span style="display:none">${a4j.version}</span>
+<span style="display:none">#{a4j.version}</span>
<h:panelGrid columns="2" columnClasses="samples,legend">
<h:panelGroup>
<rich:panel id="bad" styleClass="sample-panel">
@@ -40,7 +40,6 @@
</h:panelGrid>
</h:form>
</rich:panel>
-<rich:spacer height="5px"/>
<rich:panel id="good" styleClass="sample-panel">
<f:facet name="header">
Example of CORRECT approach to the problem
@@ -59,6 +58,26 @@
</h:panelGrid>
</h:form>
</rich:panel>
+<rich:panel id="good_ii" styleClass="sample-panel">
+ <f:facet name="header">
+ Example of ALTERNATIVE approach to the problem
+ </f:facet>
+ <h:form>
+ <a4j:outputPanel ajaxRendered="true">
+ <h:message for="good_input_ii" />
+ </a4j:outputPanel>
+ <h:panelGrid columns="2" styleClass="grid" columnClasses="formLeft,formRight">
+ <h:outputText value="Enter credit card number:"/>
+ <h:inputText id="good_input_ii" value="#{data.creditCard}" styleClass="input"/>
+ <h:outputText value="Or use your pre-defined credit card:"/>
+ <a4j:region>
+ <a4j:commandLink immediate="true" action="#{data.useMyCreditCard_incorrect}" reRender="good_ii" styleClass="command" value="#{data.myCreditCardName}"/>
+ </a4j:region>
+ <h:outputText value="Your entered credit card number:"/>
+ <h:outputText value="#{data.creditCard}" styleClass="output"/>
+ </h:panelGrid>
+ </h:form>
+</rich:panel>
</h:panelGroup>
<h:panelGroup styleClass="legend">
<h3>Use case</h3>
@@ -72,11 +91,11 @@
<h3>Page Sources</h3>
<p class="source">
<h:outputText value="Enter credit card number:"/><br/>
-<h:inputText value="+{data.creditCard}"/><br/>
+<h:inputText value="<span>#</span>{data.creditCard}"/><br/>
<h:outputText value="Or use your pre-defined credit card:"/><br/>
-<a4j:commandLink immediate="true" action="+{data.useMyCreditCard}" reRender="..." value="+{data.myCreditCardName}"/><br/>
+<a4j:commandLink immediate="true" action="<span>#</span>{data.useMyCreditCard}" reRender="..." value="<span>#</span>{data.myCreditCardName}"/><br/>
<h:outputText value="Your entered credit card number:"/><br/>
-<h:outputText value="+{data.creditCard}" styleClass="output"/><br/>
+<h:outputText value="<span>#</span>{data.creditCard}" styleClass="output"/><br/>
</p>
<h3>Bean Source (getters/setters removed)</h3>
<p class="source">
@@ -97,12 +116,12 @@
</p>
<h3>Valid Page Sources</h3>
<p class="source">
-<h:outputText <b>binding="+{data.component}"</b> value="Enter credit card number:"/><br/>
-<h:inputText value="+{data.creditCard}"/><br/>
+<h:outputText <b>binding="<span>#</span>{data.component}"</b> value="Enter credit card number:"/><br/>
+<h:inputText value="<span>#</span>{data.creditCard}"/><br/>
<h:outputText value="Or use your pre-defined credit card:"/><br/>
-<a4j:commandLink immediate="true" action="+{data.useMyCreditCard}" reRender="..." value="+{data.myCreditCardName}"/><br/>
+<a4j:commandLink immediate="true" action="<span>#</span>{data.useMyCreditCard}" reRender="..." value="<span>#</span>{data.myCreditCardName}"/><br/>
<h:outputText value="Your entered credit card number:"/><br/>
-<h:outputText value="+{data.creditCard}" styleClass="output"/><br/>
+<h:outputText value="<span>#</span>{data.creditCard}" styleClass="output"/><br/>
</p>
<h3>Valid Bean Source (getters/setters removed)</h3>
<p class="source">
@@ -115,6 +134,28 @@
<rich:spacer width="20px"/>return null;<br/>
}<br/>
</p>
+<h3>Alternative approach</h3>
+<p>
+Alternative approach uses a4j:region component to limit set of processed inputs. As the result submittedValue is not pushed to the input component (because it is outside of the a4j:region). Therefore, component will evaluate value binding and use value from the model for rendering.
+</p>
+<h3>Alternative Page Sources</h3>
+<p class="source">
+<h:outputText value="Enter credit card number:"/><br/>
+<h:inputText value="<span>#</span>{data.creditCard}"/><br/>
+<h:outputText value="Or use your pre-defined credit card:"/><br/>
+<b><a4j:region><br/></b>
+<rich:spacer width="20px"/><a4j:commandLink immediate="true" action="<span>#</span>{data.useMyCreditCard}" reRender="..." value="<span>#</span>{data.myCreditCardName}"/><br/>
+<b></a4j:region><br/></b>
+<h:outputText value="Your entered credit card number:"/><br/>
+<h:outputText value="<span>#</span>{data.creditCard}" styleClass="output"/><br/>
+</p>
+<h3>Alternative Bean Source (getters/setters removed)</h3>
+<p class="source">
+public String useMyCreditCard() {<br/>
+<rich:spacer width="20px"/>setCreditCard(getMyCreadtCard());<br/>
+<rich:spacer width="20px"/>return null;<br/>
+}<br/>
+</p>
<h3>Success</h3>
<p>
Hopefully now my solution works!
@@ -124,7 +165,7 @@
You need to be careful with input components. In some cases you have to be aware of their complex internal structures.
</p>
<p>
-My example is based on <b>JSF 1.2 RI</b> and <b>Facelets</b>. You can download it from <a href="#">here</a>.
+My example is based on <b>JSF 1.2 RI</b> and <b>Facelets</b>. You can download it from <a href="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/local-value-demo/">here</a>. <a href="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/local-value-demo/s...">Here is page source</a>. <a href="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/local-value-demo/s...">Here is bean source</a>.
</p>
</h:panelGroup>
</body>
16 years, 9 months
JBoss Rich Faces SVN: r2041 - trunk/framework/impl/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-02 21:28:53 -0400 (Thu, 02 Aug 2007)
New Revision: 2041
Modified:
trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
Log:
fix typo error
Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-03 01:21:52 UTC (rev 2040)
+++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-03 01:28:53 UTC (rev 2041)
@@ -37,7 +37,7 @@
* Revision version, must be auto modified by CVS
*/
- public static final String REVISION = "0-SNAPSHOT"
+ public static final String REVISION = "0-SNAPSHOT" ;
public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$";
public static final Version _version = new Version();
16 years, 9 months
JBoss Rich Faces SVN: r2040 - trunk/samples/local-value-demo.
by richfaces-svn-commits＠lists.jboss.org
Author: ishabalov
Date: 2007-08-02 21:21:52 -0400 (Thu, 02 Aug 2007)
New Revision: 2040
Modified:
trunk/samples/local-value-demo/pom.xml
Log:
Fixed dependencies problem
Modified: trunk/samples/local-value-demo/pom.xml
===================================================================
--- trunk/samples/local-value-demo/pom.xml 2007-08-03 00:03:30 UTC (rev 2039)
+++ trunk/samples/local-value-demo/pom.xml 2007-08-03 01:21:52 UTC (rev 2040)
@@ -1,23 +1,29 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>local-value-demo</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>local-value-demo Maven Webapp</name>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <finalName>local-value-demo</finalName>
- </build>
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>local-value-demo</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>local-value-demo Maven Webapp</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces-ui</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>local-value-demo</finalName>
+ </build>
+</project>
16 years, 9 months
JBoss Rich Faces SVN: r2039 - in trunk: framework/impl/src/main/java/org/ajax4jsf/webapp and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-02 20:03:30 -0400 (Thu, 02 Aug 2007)
New Revision: 2039
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java
trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
trunk/ui/assembly/pom.xml
Log:
Resolve issues :
http://jira.jboss.com/jira/browse/RF-401
http://jira.jboss.com/jira/browse/AJSF-65
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-02 23:02:15 UTC (rev 2038)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-03 00:03:30 UTC (rev 2039)
@@ -729,8 +729,8 @@
// for different environment ( portal, cocoon etc )
if (response instanceof HttpServletResponse) {
HttpServletResponse httpResponse = (HttpServletResponse) response;
- httpResponse.setHeader(AjaxContainerRenderer.AJAX_UPDATE_HEADER,
- senderString.toString());
+// httpResponse.setHeader(AjaxContainerRenderer.AJAX_UPDATE_HEADER,
+// senderString.toString());
httpResponse.setHeader(AjaxContainerRenderer.AJAX_FLAG_HEADER,
"true");
} else {
@@ -738,10 +738,10 @@
Method setHeadergMethod = response.getClass()
.getMethod("setHeader",
new Class[] { String.class, String.class });
+// setHeadergMethod.invoke(response, new Object[] {
+// AjaxContainerRenderer.AJAX_UPDATE_HEADER,
+// senderString.toString() });
setHeadergMethod.invoke(response, new Object[] {
- AjaxContainerRenderer.AJAX_UPDATE_HEADER,
- senderString.toString() });
- setHeadergMethod.invoke(response, new Object[] {
AjaxContainerRenderer.AJAX_FLAG_HEADER, "true" });
} catch (Exception e) {
log
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 23:02:15 UTC (rev 2038)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/WebXml.java 2007-08-03 00:03:30 UTC (rev 2039)
@@ -39,6 +39,7 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.richfaces.VersionBean;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -66,7 +67,7 @@
static final String WEB_XML = "/WEB-INF/web.xml";
- public static final String RESOURCE_URI_PREFIX = "a4j.res/";
+ public static final String RESOURCE_URI_PREFIX = "a4j_"+VersionBean.MAJOR_VERSION+"_"+VersionBean.MINOR_VERSION+"_"+VersionBean.REVISION;
static final String RESOURCE_URI_PREFIX_WITH_SLASH = "/"
+ RESOURCE_URI_PREFIX;
Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-02 23:02:15 UTC (rev 2038)
+++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2007-08-03 00:03:30 UTC (rev 2039)
@@ -37,7 +37,8 @@
* Revision version, must be auto modified by CVS
*/
- public static final String REVISION = ".0-rc1 , SVN $Revision$ $Date$";//$Revision$ $Date$";
+ public static final String REVISION = "0-SNAPSHOT"
+ public static final String SCM_REVISION = " SVN $Revision$ $Date$";//$Revision$ $Date$";
public static final Version _version = new Version();
public String getVendor() {
@@ -60,7 +61,7 @@
*/
private static class Version {
- public static final String _versionInfo = "v."+MAJOR_VERSION+"."+MINOR_VERSION+"."+REVISION;
+ public static final String _versionInfo = "v."+MAJOR_VERSION+"."+MINOR_VERSION+"."+REVISION+SCM_REVISION;
public int getMajor() {
return MAJOR_VERSION;
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2007-08-02 23:02:15 UTC (rev 2038)
+++ trunk/ui/assembly/pom.xml 2007-08-03 00:03:30 UTC (rev 2039)
@@ -26,7 +26,7 @@
<uri>
http://richfaces.ajax4jsf.org/rich
</uri>
- <displayName>RichFaces</displayName>
+ <displayName>RichFaces ( Legacy URL )</displayName>
<excludeModules>core</excludeModules>
</taglib>
<taglib>
@@ -53,7 +53,7 @@
<uri>
https://ajax4jsf.dev.java.net/ajax
</uri>
- <displayName>RichFaces</displayName>
+ <displayName>Ajax4jsf ( Legacy URL )</displayName>
<includeModules>core</includeModules>
</taglib>
</taglibs>
16 years, 9 months
JBoss Rich Faces SVN: r2038 - trunk/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: ishabalov
Date: 2007-08-02 19:02:15 -0400 (Thu, 02 Aug 2007)
New Revision: 2038
Modified:
trunk/samples/pom.xml
Log:
Default JSF version back to 1.2
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-08-02 23:00:44 UTC (rev 2037)
+++ trunk/samples/pom.xml 2007-08-02 23:02:15 UTC (rev 2038)
@@ -141,7 +141,7 @@
<profile>
<id>jsf1_1</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
<property>
<name>jsfVersion</name>
<value>1.1</value>
@@ -240,6 +240,9 @@
</profile>
<profile>
<id>tomcat5</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<defaultGoal>jetty:run</defaultGoal>
<plugins>
16 years, 9 months
JBoss Rich Faces SVN: r2037 - trunk/samples/richfaces-demo.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-02 19:00:44 -0400 (Thu, 02 Aug 2007)
New Revision: 2037
Modified:
trunk/samples/richfaces-demo/pom.xml
Log:
Exclude core library from demo
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2007-08-02 22:30:38 UTC (rev 2036)
+++ trunk/samples/richfaces-demo/pom.xml 2007-08-02 23:00:44 UTC (rev 2037)
@@ -16,6 +16,12 @@
<artifactId>richfaces-ui</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<finalName>richfaces-demo</finalName>
16 years, 9 months