JBoss Rich Faces SVN: r12053 - trunk/ui/message/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-12-29 18:35:58 -0500 (Mon, 29 Dec 2008)
New Revision: 12053
Modified:
trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java
Log:
https://jira.jboss.org/jira/browse/RF-5482
Modified: trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2008-12-29 19:24:34 UTC (rev 12052)
+++ trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2008-12-29 23:35:58 UTC (rev 12053)
@@ -48,9 +48,9 @@
*/
public abstract class UIRichMessages extends UIMessages implements AjaxOutput {
- public static final String COMPONENT_TYPE = "org.richfaces.component.RichMessages";
+ public static final String COMPONENT_TYPE = "org.richfaces.component.RichMessages";
- private String forVal = null;
+ private String forVal = null;
private boolean updated = false;
private List<FacesMessageWithId> renderedMessages;
@@ -127,8 +127,8 @@
}
}
;
- final Iterator<FacesMessageWithId> iterator = this
- .renderedMessages.iterator();
+ final Iterator<FacesMessageWithId> iterator = this.renderedMessages
+ .iterator();
return new Iterator<FacesMessage>() {
public boolean hasNext() {
@@ -153,7 +153,8 @@
.iterator();
while (renderedMessageIterator.hasNext()) {
String clientId = renderedMessageIterator.next().getClientId();
- if ((null == forId && null == clientId) || (null != forId && forId.equals(clientId))) {
+ if ((null == forId && null == clientId)
+ || (null != forId && forId.equals(clientId))) {
renderedMessageIterator.remove();
}
}
@@ -174,8 +175,7 @@
FacesMessage message = messages.next();
if (severenities.size() == 0 || severenities.contains("ALL")
|| isApplicableMessage(severenities, message)) {
- renderedMessages.add(
- new FacesMessageWithId(forId, message));
+ renderedMessages.add(new FacesMessageWithId(forId, message));
}
}
}
@@ -193,7 +193,7 @@
Severity severity = message.getSeverity();
for (Object key : FacesMessage.VALUES_MAP.keySet()) {
Severity sev = (Severity) FacesMessage.VALUES_MAP.get(key);
- if(0 == sev.compareTo(severity)){
+ if (0 == sev.compareTo(severity)) {
return severenities.contains(key);
}
}
@@ -264,11 +264,10 @@
*
*/
@SuppressWarnings("serial")
- public static class FacesMessageWithId implements
- Serializable {
+ public static class FacesMessageWithId implements Serializable {
private FacesMessage message;
- private final String clientId;
+ private String clientId;
/**
* @param clientId
@@ -292,10 +291,39 @@
public String getClientId() {
return clientId;
}
-
-
-
+ /**
+ * <p>
+ * Persist {@link FacesMessageWithId} artifacts,
+ * including the non serializable <code>Severity</code>.
+ * </p>
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.writeUTF(clientId);
+ out.writeInt(message.getSeverity().getOrdinal());
+ out.writeUTF(message.getSummary());
+ out.writeUTF(message.getDetail());
+ }
+
+ /**
+ * <p>
+ * Reconstruct {@link FacesMessageWithId} from
+ * serialized artifacts.
+ * </p>
+ */
+ private void readObject(ObjectInputStream in) throws IOException,
+ ClassNotFoundException {
+ clientId = in.readUTF();
+ Severity severity = FacesMessage.SEVERITY_INFO;
+ int ordinal = in.readInt();
+ if (ordinal >= 0 && ordinal < FacesMessage.VALUES.size()) {
+ severity = (Severity) FacesMessage.VALUES.get(ordinal);
+ }
+ String summary = in.readUTF();
+ String detail = in.readUTF();
+ message = new FacesMessage(severity, summary, detail);
+ }
+
}
/**
15 years, 12 months
JBoss Rich Faces SVN: r12052 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-29 14:24:34 -0500 (Mon, 29 Dec 2008)
New Revision: 12052
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
Log:
https://jira.jboss.org/jira/browse/RF-5168
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-12-29 18:31:32 UTC (rev 12051)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-12-29 19:24:34 UTC (rev 12052)
@@ -92,6 +92,7 @@
position: absolute;
top: 3px;
right: 3px;
+ z-index: 1;
}
.rich-modalpanel {
15 years, 12 months
JBoss Rich Faces SVN: r12051 - trunk/ui/suggestionbox/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-29 13:31:32 -0500 (Mon, 29 Dec 2008)
New Revision: 12051
Modified:
trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
Log:
https://jira.jboss.org/jira/browse/RF-1793
Modified: trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java
===================================================================
--- trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2008-12-29 18:07:20 UTC (rev 12050)
+++ trunk/ui/suggestionbox/src/test/java/org/richfaces/component/SuggestionBoxComponentTest.java 2008-12-29 18:31:32 UTC (rev 12051)
@@ -163,8 +163,9 @@
public void testBroadcast() throws Exception {
HtmlPage page = renderView();
assertNotNull(page);
- sb.setFetchValue("1");
- sb.setSubmitedValue(null, new String[]{"1"});
+ sb.setVar("item");
+ sb.setValueExpression("fetchValue", application.getExpressionFactory().createValueExpression(elContext, "#{item}", Object.class));
+ sb.setSubmitedValue(null, new String[]{"1", "2", "11"});
sb.broadcast(new AjaxEvent(sb));
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(facesContext);
@@ -177,7 +178,10 @@
assertEquals(Arrays.asList(SUGGESTION), suggestinObjects);
Map requestedObjectsObjects = (Map)data.get("requestedObjects");
assertNotNull(requestedObjectsObjects);
+ assertEquals(2, requestedObjectsObjects.size());
assertEquals(requestedObjectsObjects.get("1"), "1");
+ assertEquals(requestedObjectsObjects.get("2"), "2");
+ assertNull(requestedObjectsObjects.get("11"));
}
public void testDecode() throws Exception {
15 years, 12 months
JBoss Rich Faces SVN: r12050 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-29 13:07:20 -0500 (Mon, 29 Dec 2008)
New Revision: 12050
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-5452
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2008-12-29 15:43:38 UTC (rev 12049)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/organiser.xhtml 2008-12-29 18:07:20 UTC (rev 12050)
@@ -29,8 +29,8 @@
<a4j:outputPanel layout="block" id="cell" onclick="#{rich:component('organizer')}.resetSelectedDate()" style="height: 100%;">
<h:panelGrid columns="1">
<h:outputText value="{day}" style="align:center"/>
- <h:outputText value="{data.shortDescription}"/>
- <h:outputText value="{data.description}"/>
+ <h:outputText value="{data.shortDescription.escapeHTML()}"/>
+ <h:outputText value="{data.description.escapeHTML()}"/>
</h:panelGrid>
</a4j:outputPanel>
</rich:calendar>
15 years, 12 months
JBoss Rich Faces SVN: r12049 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-12-29 10:43:38 -0500 (Mon, 29 Dec 2008)
New Revision: 12049
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
https://jira.jboss.org/jira/browse/RF-4567
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-12-29 15:13:26 UTC (rev 12048)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-12-29 15:43:38 UTC (rev 12049)
@@ -1571,8 +1571,6 @@
// render
this.renderHF();
- this.renderHeaderOptional();
- this.renderFooterOptional();
//days render
p=0;
@@ -1706,6 +1704,9 @@
{
if (this.params.showHeader) this.renderMarkup(this.params.headerMarkup, this.id+"Header", this.calendarContext);
if (this.params.showFooter) this.renderMarkup(this.params.footerMarkup, this.id+"Footer", this.calendarContext);
+
+ this.renderHeaderOptional();
+ this.renderFooterOptional();
},
renderHeaderOptional: function()
15 years, 12 months
JBoss Rich Faces SVN: r12048 - trunk/samples/richfaces-demo/src/main/webapp/templates/include.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-12-29 10:13:26 -0500 (Mon, 29 Dec 2008)
New Revision: 12048
Modified:
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 15:00:43 UTC (rev 12047)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 15:13:26 UTC (rev 12048)
@@ -9,7 +9,7 @@
<tbody>
<a4j:repeat var="component" value="#{components}">
<tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'">
- <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-5px; left:10px;" alt="" width="10" height="10"/></td>
+ <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></td>
<td class="text #{component.newComponent?'bold':''}" width="100%">
<h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}">
<span style="display:block;padding-top:3px;text-decoration : none; color : #000000;">
15 years, 12 months
JBoss Rich Faces SVN: r12047 - in trunk/samples/richfaces-demo/src/main: webapp/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-12-29 10:00:43 -0500 (Mon, 29 Dec 2008)
New Revision: 12047
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
trunk/samples/richfaces-demo/src/main/webapp/css/common.css
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4910
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-12-29 15:00:43 UTC (rev 12047)
@@ -125,6 +125,67 @@
return ret;
}
+ private boolean checkNewComponents(List<ComponentDescriptor> groups){
+ for (ComponentDescriptor component : groups) {
+ if (component.isNewComponent()) return true;
+ }
+ return false;
+ }
+
+ public boolean isValidatorsHasNew() {
+ return checkNewComponents(getFilteredComponents("richValidators"));
+ }
+
+ public boolean isSelectHasNew() {
+ return checkNewComponents(getFilteredComponents("richSelect"));
+ }
+
+ public boolean isRichDragDropHasNew() {
+ return checkNewComponents(getFilteredComponents("richDragDrop"));
+ }
+
+ public boolean isRichDataIteratorsHasNew() {
+ return checkNewComponents(getFilteredComponents("richDataIterators"));
+ }
+
+ public boolean isRichMenuHasNew() {
+ return checkNewComponents(getFilteredComponents("richMenu"));
+ }
+
+ public boolean isRichTreeHasNew() {
+ return checkNewComponents(getFilteredComponents("richTree"));
+ }
+
+ public boolean isRichInputsHasNew() {
+ return checkNewComponents(getFilteredComponents("richInputs"));
+ }
+
+ public boolean isRichOutputsHasNew() {
+ return checkNewComponents(getFilteredComponents("richOutputs"));
+ }
+
+ public boolean isAjaxSupportHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxSupport"));
+ }
+
+ public boolean isAjaxResourcesHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxResources"));
+ }
+
+ public boolean isAjaxOutputHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxOutput"));
+ }
+
+ public boolean isAjaxMiscHasNew() {
+ return checkNewComponents(getFilteredComponents("ajaxMisc"));
+ }
+
+ public boolean isRichMiscHasNew() {
+ return checkNewComponents(getFilteredComponents("richMisc"));
+ }
+
+ // ************************************************************************************
+
public List getValidatorsComponents() {
return getFilteredComponents("richValidators");
}
@@ -176,7 +237,7 @@
public List getRichMisc() {
return getFilteredComponents("richMisc");
}
-
+// ************************************************************************************
public List getComponents() {
Iterator it = components_().iterator();
ComponentDescriptor cur = getCurrentComponent();
Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-12-29 15:00:43 UTC (rev 12047)
@@ -194,7 +194,7 @@
.panel_menu div.rich-panelbar-header, .panel_menu div.rich-panelbar-header-act{
background-color: #E4EAEF;
background-image:none;
- padding:3px 20px 3px 20px;
+ padding:3px 10px 3px 20px;
border-top: 1px solid white;
border-bottom: 1px solid white;
color: black;
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-29 15:00:43 UTC (rev 12047)
@@ -6,10 +6,10 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<table border="0" cellpadding="0" cellspacing="1">
- <tbody>
+ <tbody>
<a4j:repeat var="component" value="#{components}">
<tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'">
- <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /></td>
+ <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-5px; left:10px;" alt="" width="10" height="10"/></td>
<td class="text #{component.newComponent?'bold':''}" width="100%">
<h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}">
<span style="display:block;padding-top:3px;text-decoration : none; color : #000000;">
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-29 14:26:43 UTC (rev 12046)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-29 15:00:43 UTC (rev 12047)
@@ -6,68 +6,172 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<rich:panel styleClass="panel_menu" bodyClass="rich-laguna-panel-no-header">
-<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="650px" contentStyle="background:none;">
- <rich:panelBarItem id="ajaxSupport" label="Ajax Support">
+<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="690px" contentStyle="background:none;">
+ <rich:panelBarItem id="ajaxSupport">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Support" />
+ <ui:param name="isNew" value="#{componentNavigator.ajaxSupportHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxSupport}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="ajaxResources" label="Resources/Beans Handling">
+ <rich:panelBarItem id="ajaxResources">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Resources/Beans Handling"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxResourcesHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxResources}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richValidators" label="Ajax Validators">
+ <rich:panelBarItem id="richValidators">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Validators"/>
+ <ui:param name="isNew" value="#{componentNavigator.validatorsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.validatorsComponents}" />
- </ui:include>
+ </ui:include>
</rich:panelBarItem>
- <rich:panelBarItem styleClass="panel_menu_bar" id="ajaxOutput" label="Ajax Output">
+ <rich:panelBarItem styleClass="panel_menu_bar" id="ajaxOutput">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Output"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxOutputHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxOutput}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="ajaxMisc" label="Ajax Miscellaneous">
+ <rich:panelBarItem id="ajaxMisc">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Ajax Miscellaneous"/>
+ <ui:param name="isNew" value="#{componentNavigator.ajaxMiscHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxMisc}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richDataIterators" label="Data Iteration">
+ <rich:panelBarItem id="richDataIterators">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Data Iteration"/>
+ <ui:param name="isNew" value="#{componentNavigator.richDataIteratorsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richDataIterators}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richDragDrop" label="Drag-Drop Support">
+ <rich:panelBarItem id="richDragDrop">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Drag-Drop Support"/>
+ <ui:param name="isNew" value="#{componentNavigator.richDragDropHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richDragDropComponents}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richMenu" label="Rich Menu">
+ <rich:panelBarItem id="richMenu">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Menu"/>
+ <ui:param name="isNew" value="#{componentNavigator.richMenuHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richMenu}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richTree" label="Rich Trees">
+ <rich:panelBarItem id="richTree">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Trees"/>
+ <ui:param name="isNew" value="#{componentNavigator.richTreeHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richTree}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richOutputs" label="Rich Output">
+ <rich:panelBarItem id="richOutputs">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value= "Rich Output"/>
+ <ui:param name="isNew" value="#{componentNavigator.richOutputsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richOutputs}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richInputs" label="Rich Input">
+ <rich:panelBarItem id="richInputs">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value= "Rich Input"/>
+ <ui:param name="isNew" value="#{componentNavigator.richInputsHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richInputs}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richSelect" label="Rich Selects">
+ <rich:panelBarItem id="richSelect">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Selects"/>
+ <ui:param name="isNew" value="#{componentNavigator.selectHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.selectComponents}" />
</ui:include>
</rich:panelBarItem>
- <rich:panelBarItem id="richMisc" label="Rich Miscellaneous">
+ <rich:panelBarItem id="richMisc">
+ <f:facet name="label">
+ <h:panelGroup layout="block">
+ <ui:include src="/templates/include/navigationPanelHeader.xhtml" >
+ <ui:param name="label" value="Rich Miscellaneous"/>
+ <ui:param name="isNew" value="#{componentNavigator.richMiscHasNew}" />
+ </ui:include>
+ </h:panelGroup>
+ </f:facet>
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.richMisc}" />
</ui:include>
15 years, 12 months
JBoss Rich Faces SVN: r12046 - trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-12-29 09:26:43 -0500 (Mon, 29 Dec 2008)
New Revision: 12046
Modified:
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
Log:
https://jira.jboss.org/jira/browse/RF-4023
Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2008-12-29 13:41:01 UTC (rev 12045)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2008-12-29 14:26:43 UTC (rev 12046)
@@ -29,7 +29,9 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -80,6 +82,64 @@
private static final String SRC_MAIN_CONFIG_RESOURCES = "src/main/config/resources";
private static final String META_INF_SKINS = "META-INF/skins/";
+
+ private static final Set<String> JAVA_RESERVED_WORDS;
+
+ static{
+ JAVA_RESERVED_WORDS = new HashSet<String>();
+ JAVA_RESERVED_WORDS.add("abstract");
+ JAVA_RESERVED_WORDS.add("assert");
+ JAVA_RESERVED_WORDS.add("boolean");
+ JAVA_RESERVED_WORDS.add("break");
+ JAVA_RESERVED_WORDS.add("byte");
+ JAVA_RESERVED_WORDS.add("case");
+ JAVA_RESERVED_WORDS.add("catch");
+ JAVA_RESERVED_WORDS.add("char");
+ JAVA_RESERVED_WORDS.add("class");
+ JAVA_RESERVED_WORDS.add("const");
+ JAVA_RESERVED_WORDS.add("continue");
+ JAVA_RESERVED_WORDS.add("default");
+ JAVA_RESERVED_WORDS.add("do");
+ JAVA_RESERVED_WORDS.add("double");
+ JAVA_RESERVED_WORDS.add("else");
+ JAVA_RESERVED_WORDS.add("extends");
+ JAVA_RESERVED_WORDS.add("false");
+ JAVA_RESERVED_WORDS.add("final");
+ JAVA_RESERVED_WORDS.add("finally");
+ JAVA_RESERVED_WORDS.add("float");
+ JAVA_RESERVED_WORDS.add("for");
+ JAVA_RESERVED_WORDS.add("goto");
+ JAVA_RESERVED_WORDS.add("if");
+ JAVA_RESERVED_WORDS.add("implements");
+ JAVA_RESERVED_WORDS.add("import");
+ JAVA_RESERVED_WORDS.add("instanceof");
+ JAVA_RESERVED_WORDS.add("int");
+ JAVA_RESERVED_WORDS.add("interface");
+ JAVA_RESERVED_WORDS.add("long");
+ JAVA_RESERVED_WORDS.add("native");
+ JAVA_RESERVED_WORDS.add("new");
+ JAVA_RESERVED_WORDS.add("null");
+ JAVA_RESERVED_WORDS.add("package");
+ JAVA_RESERVED_WORDS.add("private");
+ JAVA_RESERVED_WORDS.add("protected");
+ JAVA_RESERVED_WORDS.add("public");
+ JAVA_RESERVED_WORDS.add("return");
+ JAVA_RESERVED_WORDS.add("short");
+ JAVA_RESERVED_WORDS.add("static");
+ JAVA_RESERVED_WORDS.add("strictfp");
+ JAVA_RESERVED_WORDS.add("super");
+ JAVA_RESERVED_WORDS.add("switch");
+ JAVA_RESERVED_WORDS.add("synchronized");
+ JAVA_RESERVED_WORDS.add("this");
+ JAVA_RESERVED_WORDS.add("throw");
+ JAVA_RESERVED_WORDS.add("throws");
+ JAVA_RESERVED_WORDS.add("transient");
+ JAVA_RESERVED_WORDS.add("true");
+ JAVA_RESERVED_WORDS.add("try");
+ JAVA_RESERVED_WORDS.add("void");
+ JAVA_RESERVED_WORDS.add("volatile");
+ JAVA_RESERVED_WORDS.add("while");
+ }
/**
* Name of base package of skin.
@@ -159,8 +219,15 @@
getLog().debug("Skin name is supposed to be " + shortName);
getLog().debug("Root package " + packageName);
getLog().debug("Skin package is " + fullSkinName);
+
+ //RF-4023
+ if(JAVA_RESERVED_WORDS.contains(skinName)){
+ throw new MojoExecutionException("Invalid skin name '" + skinName + "'. Please type another name.");
+ }
+ if(JAVA_RESERVED_WORDS.contains(packageName)){
+ throw new MojoExecutionException("Invalid skin package '" + packageName + "'. Please type another package.");
+ }
-
SkinInfo skinInfoTemplate = new SkinInfo();
skinInfoTemplate.setShortName(shortName);
skinInfoTemplate.setPackageName(fullSkinName.toLowerCase());
15 years, 12 months
JBoss Rich Faces SVN: r12045 - in trunk/samples/editorSeam-sample: src/main/webapp and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-12-29 08:41:01 -0500 (Mon, 29 Dec 2008)
New Revision: 12045
Added:
trunk/samples/editorSeam-sample/src/main/webapp/index.html
Modified:
trunk/samples/editorSeam-sample/pom.xml
trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/components.xml
trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml
Log:
now this sample can build under Tomcat
Modified: trunk/samples/editorSeam-sample/pom.xml
===================================================================
--- trunk/samples/editorSeam-sample/pom.xml 2008-12-29 13:28:10 UTC (rev 12044)
+++ trunk/samples/editorSeam-sample/pom.xml 2008-12-29 13:41:01 UTC (rev 12045)
@@ -30,18 +30,6 @@
<version>2.1.0.SP1</version>
<exclusions>
<exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
</exclusion>
@@ -57,30 +45,45 @@
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.8.0.GA</version>
+</dependency>
+<dependency>
+<groupId>org.apache.geronimo.specs</groupId>
+<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+<version>1.1</version>
+</dependency>
+<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ </dependency>
+<dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+</dependency>
+<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>2.1.0.SP1</version>
<exclusions>
<exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
<artifactId>jsf-api</artifactId>
<groupId>javax.faces</groupId>
</exclusion>
@@ -92,41 +95,10 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ioc</artifactId>
- <version>2.1.0.SP1</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
<version>2.1.0.SP1</version>
<exclusions>
<exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
<artifactId>jsf-api</artifactId>
<groupId>javax.faces</groupId>
</exclusion>
@@ -136,75 +108,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-mail</artifactId>
- <version>2.1.0.SP1</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- <version>2.1.0.SP1</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-remoting</artifactId>
- <version>2.1.0.SP1</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>javassist</artifactId>
- <groupId>jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
<finalName>editorSeam-sample</finalName>
Modified: trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/components.xml 2008-12-29 13:28:10 UTC (rev 12044)
+++ trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/components.xml 2008-12-29 13:41:01 UTC (rev 12045)
@@ -6,18 +6,20 @@
xmlns:bpm="http://jboss.com/products/seam/bpm"
xmlns:security="http://jboss.com/products/seam/security"
xmlns:mail="http://jboss.com/products/seam/mail"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pdf="http://jboss.com/products/seam/pdf"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:pdf="http://jboss.com/products/seam/pdf"
+ xmlns:transaction="http://jboss.com/products/seam/transaction"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.0.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
-
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ <core:init debug="true" transaction-management-enabled="false" jndi-pattern="@jndiPattern@"/>
+ <transaction:no-transaction/>
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
conversation-id-parameter="cid"
Modified: trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/faces-config.xml 2008-12-29 13:28:10 UTC (rev 12044)
+++ trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/faces-config.xml 2008-12-29 13:41:01 UTC (rev 12045)
@@ -7,6 +7,16 @@
<managed-bean-class>org.richfaces.EditorBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+<application>
+ <locale-config>
+ <default-locale>en</default-locale>
+ <supported-locale>bg</supported-locale>
+ <supported-locale>de</supported-locale>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <supported-locale>tr</supported-locale>
+ </locale-config>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application>
</faces-config>
Modified: trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml 2008-12-29 13:28:10 UTC (rev 12044)
+++ trunk/samples/editorSeam-sample/src/main/webapp/WEB-INF/web.xml 2008-12-29 13:41:01 UTC (rev 12045)
@@ -16,25 +16,46 @@
<param-value>true</param-value>
</context-param>
<listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
- </listener>
- <filter>
- <filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
- </filter>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
<filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- Facelets development mode (disable in production) -->
+
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!-- JSF -->
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
Added: trunk/samples/editorSeam-sample/src/main/webapp/index.html
===================================================================
--- trunk/samples/editorSeam-sample/src/main/webapp/index.html (rev 0)
+++ trunk/samples/editorSeam-sample/src/main/webapp/index.html 2008-12-29 13:41:01 UTC (rev 12045)
@@ -0,0 +1,5 @@
+<html>
+<head>
+ <meta http-equiv="Refresh" content="0; URL=pages/editor.seam">
+</head>
+</html>
\ No newline at end of file
Property changes on: trunk/samples/editorSeam-sample/src/main/webapp/index.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:eol-style
+ native
15 years, 12 months
JBoss Rich Faces SVN: r12044 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-12-29 08:28:10 -0500 (Mon, 29 Dec 2008)
New Revision: 12044
Modified:
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
Log:
RF-5287: describeInputNumberSlider 2 new features
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-12-29 12:55:10 UTC (rev 12043)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-12-29 13:28:10 UTC (rev 12044)
@@ -253,8 +253,7 @@
</mediaobject>
</figure>-->
- <para><emphasis><property>"showArrows"</property></emphasis>.
- When set to "true", this boolean attribute enables additional controls for increasing and decreasing slider value.
+ <para>The <emphasis><property>"showArrows"</property></emphasis> boolean attribute when set to "true" enables additional controls for increasing and decreasing slider value.
The controls (arrows by default) are placed in the beginning and in the end of slider track:</para>
<figure>
<title><emphasis role="bold"><property><rich:inputNumberSlider></property></emphasis> with additional controls</title>
15 years, 12 months