richfaces-svn-commits
September 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 488 discussions
JBoss Rich Faces SVN: r3015 - trunk/ui/calendar/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-09-20 09:45:05 -0400 (Thu, 20 Sep 2007)
New Revision: 3015
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
RF-946
processing preloadDateRangeBegin/End=null
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-20 13:26:44 UTC (rev 3014)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-20 13:45:05 UTC (rev 3015)
@@ -296,7 +296,7 @@
AjaxContext ajaxContext = AjaxContext
.getCurrentInstance(facesContext);
ajaxContext.addRegionsFromComponent(this);
- ajaxContext.setResponseData(getPreload());
+ if(getPreload()!=null){ajaxContext.setResponseData(getPreload());}
} else {
if (event instanceof CurrentDateChangeEvent) {
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -392,9 +392,17 @@
public Date[] getPreloadDateRange() {
Date dateRangeBegin = this.getPreloadDateRangeBegin();
Date dateRangeEnd = this.getPreloadDateRangeEnd();
-
+
+ if(dateRangeBegin==null&&dateRangeEnd==null){
+ return null;
+ }
+ else{
if (dateRangeBegin.after(dateRangeEnd)) {
- // TODO add message
+ // XXX add message
+ FacesMessage message = new FacesMessage("preloadDateRangeBegin is greater than preloadDateRangeEnd");
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ FacesContext context = FacesContext.getCurrentInstance();
+ context.addMessage(getClientId(context), message);
throw new IllegalArgumentException();
}
@@ -413,6 +421,7 @@
return (Date[]) dates.toArray(new Date[dates.size()]);
}
+ }
public void addCurrentDateChangeListener(CurrentDateChangeListener listener) {
addFacesListener(listener);
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3014 - in trunk: ui/scrollableDataTable/src/main/java/org/richfaces/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-09-20 09:26:44 -0400 (Thu, 20 Sep 2007)
New Revision: 3014
Removed:
trunk/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java
trunk/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
Log:
RF-943
Deleted: trunk/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/framework/api/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -1,129 +0,0 @@
-/**
- *
- */
-package org.richfaces.model.selection;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class ClientSelection implements Serializable{
-
- private static final long serialVersionUID = 5855157282287053681L;
-
- public static final String FLAG_RESET = "x";
-
- public static final String FLAG_ALL = "a";
-
- private String selectionFlag;
-
- private List ranges = new ArrayList();
-
- public ClientSelection() {
- }
-
-
- public void addRange(SelectionRange range) {
- ranges.add(range);
- }
-
- public boolean isSelected(int i) {
- boolean result = false;
- Iterator iterator = ranges.iterator();
- while (iterator.hasNext() && !result) {
- result |= ((SelectionRange) iterator.next()).within(i);
- }
- return result;
- }
-
- public List getRanges() {
- return ranges;
- }
-
- public void addIndex(int j) {
- if(this.isSelected(j)) return;
-
-
-
- SelectionRange firstRange = null;
-
- int s = ranges.size();
-
- int insertPosition = 0;
-
- for(int i = 0; i < s && insertPosition >= 0 ; i++) {
-
- firstRange = (SelectionRange) ranges.get(i);
-
- if (firstRange.getStartIndex() == j + 1) {
-
- firstRange.setStartIndex(j);
- insertPosition = -1;
-
- } else if (firstRange.getEndIndex() == j - 1) {
-
- firstRange.setEndIndex(j);
-
- if (i + 1 < s) {
- SelectionRange range2 = (SelectionRange) ranges.get(i + 1);
-
- if (range2.getStartIndex() == j || range2.getStartIndex() == j + 1) {
-
- ranges.remove(i + 1);
-
- firstRange.setEndIndex(range2.getEndIndex());
- }
- }
-
- insertPosition = -1;
-
- } else if (firstRange.getStartIndex() > j) {
- insertPosition = i;
- }
-
- }
-
- if (insertPosition >= 0) {
- firstRange = new SelectionRange(j,j);
- ranges.add(insertPosition, firstRange);
-
- return;
- }
-
-
- }
-
- private boolean reset = false;
- public boolean isReset() {
- return reset;
- }
-
- private boolean selectAll = false;
- public boolean isSelectAll() {
- return selectAll;
- }
-
-
- public String getSelectionFlag() {
- return selectionFlag;
- }
-
-
- public void setSelectionFlag(String selectionFlag) {
- this.selectionFlag = selectionFlag;
-
- reset = false;
- selectAll = false;
-
- if (FLAG_ALL.equals(selectionFlag)) {
- selectAll = true;
- } else if (FLAG_RESET.equals(selectionFlag)) {
- reset = true;
- }
- }
-}
Deleted: trunk/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/framework/api/src/main/java/org/richfaces/model/selection/SelectionRange.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -1,64 +0,0 @@
-/**
- *
- */
-package org.richfaces.model.selection;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class SelectionRange {
- private int startIndex = -1;;
- private int endIndex = -1;
-
- public SelectionRange(int startIndex, int endIndex) {
- super();
- this.startIndex = startIndex;
- this.endIndex = endIndex;
- }
-
- public int getStartIndex() {
- return startIndex;
- }
-
- public void setStartIndex(int startIndex) {
- this.startIndex = startIndex;
- }
-
- public int getEndIndex() {
- return endIndex;
- }
-
- public void setEndIndex(int endIndex) {
- this.endIndex = endIndex;
- }
-
- public boolean within(int index) {
- return startIndex <= index && endIndex >= index;
- }
-
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + endIndex;
- result = prime * result + startIndex;
- return result;
- }
-
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final SelectionRange other = (SelectionRange) obj;
- if (endIndex != other.endIndex)
- return false;
- if (startIndex != other.startIndex)
- return false;
- return true;
- }
-
-
-}
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -370,6 +370,8 @@
public abstract String getSortMode();
public abstract void setSortMode(String mode);
+ public abstract Object getActiveRowKey();
+ public abstract void setActiveRowKey(Object activeRowKey);
/* (non-Javadoc)
* @see org.ajax4jsf.component.UIDataAdaptor#setRowIndex(int)
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -62,6 +62,9 @@
}
final ClientSelection clientSelection = new ClientSelection();
+ if(stringSelection == null || stringSelection.length() == 0) {
+ return clientSelection;
+ }
String [] selections = stringSelection.split(";");
int length = selections.length;
@@ -69,6 +72,8 @@
clientSelection.setSelectionFlag(selections[length-1]);
length--;
}
+ clientSelection.setActiveRowIndex(Integer.parseInt(selections[length-1]));
+ length--;
for (int i = 0; i < length; i++) {
String range = selections[i];
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -24,6 +24,8 @@
private String selectionFlag;
+ private int activeRowIndex = -1;
+
private List ranges = new ArrayList();
public ClientSelection() {
@@ -57,8 +59,8 @@
int s = ranges.size();
int insertPosition = 0;
-
- for(int i = 0; i < s && insertPosition >= 0 ; i++) {
+ int i;
+ for(i = 0; i < s && insertPosition >= 0 ; i++) {
firstRange = (SelectionRange) ranges.get(i);
@@ -86,6 +88,8 @@
} else if (firstRange.getStartIndex() > j) {
insertPosition = i;
+ } else if (insertPosition == 0 && i == s - 1) {
+ insertPosition = s;
}
}
@@ -128,4 +132,14 @@
reset = true;
}
}
+
+
+ public int getActiveRowIndex() {
+ return activeRowIndex;
+ }
+
+
+ public void setActiveRowIndex(int activeRowIndex) {
+ this.activeRowIndex = activeRowIndex;
+ }
}
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-09-20 13:26:44 UTC (rev 3014)
@@ -45,7 +45,7 @@
public void decode(FacesContext context, UIComponent component,
CompositeRenderer compositeRenderer) {
- UIScrollableDataTable grid = (UIScrollableDataTable) component;
+ final UIScrollableDataTable grid = (UIScrollableDataTable) component;
ExternalContext externalContext = context.getExternalContext();
Map requestParamMap = externalContext.getRequestParameterMap();
@@ -103,6 +103,9 @@
}
+ if(i == clientSelection.getActiveRowIndex()) {
+ grid.setActiveRowKey(rowKey);
+ }
state.nextRow();
}
@@ -194,7 +197,7 @@
}
- private void encodeSelection(FacesContext context, UIScrollableDataTable grid) throws IOException {
+ private void encodeSelection(FacesContext context, final UIScrollableDataTable grid) throws IOException {
final ScrollableDataTableRendererState state = ScrollableDataTableRendererState.createState(context, grid);
state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid));
@@ -217,6 +220,9 @@
clientSelection.addIndex(i);
}
+ if (rowKey.equals(grid.getActiveRowKey())) {
+ clientSelection.setActiveRowIndex(state.getRowIndex());
+ }
state.nextRow();
@@ -245,13 +251,16 @@
Converter converter =
application.createConverter(ClientSelection.class);
+ ClientSelection selection = (ClientSelection)grid.getAttributes().get(CLIENT_SELECTION);
String string =
- converter.getAsString(context, grid, grid.getAttributes().get(CLIENT_SELECTION));
+ converter.getAsString(context, grid, selection);
if (string == null) {
string = "";
}
+ string += selection.getActiveRowIndex();
+
String id = getSelectionInputName(context, grid);
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2007-09-20 13:10:19 UTC (rev 3013)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2007-09-20 13:26:44 UTC (rev 3014)
@@ -150,13 +150,12 @@
this.ranges = ranges;
},
- initRanges: function(rangesStr) {
- if(!rangesStr) {
+ initRanges: function(rangeStrRArray) {
+ if(rangeStrRArray.length == 0) {
this.ranges = [];
return;
}
- var rangeStrRArray = rangesStr.split(";");
- this.ranges = new Array(rangeStrRArray.length -1);
+ this.ranges = new Array(rangeStrRArray.length);
var indexStrRArray;
for(var i = 0; i < this.ranges.length; i++) {
indexStrRArray = rangeStrRArray[i].split(",");
@@ -222,6 +221,7 @@
this.grid = grid;
this.selectionFlag;
this.firstIndex;
+ this.activeRow = -1;
var gridElement = grid.getElement();
this.prefix = gridElement.id;
this.selection = new ClientUI.controls.grid.Selection();
@@ -260,7 +260,15 @@
restoreState: function() {
this.selectionFlag = null;
- this.selection.initRanges($(this.inputElement).value);
+ var selStrAr = $(this.inputElement).value.split(";");
+ if(selStrAr.length != 0) {
+ var activeRowStr = selStrAr[selStrAr.length - 1];
+ if(activeRowStr.indexOf(";") == -1) {
+ this.setActiveRow(activeRowStr);
+ selStrAr.pop();
+ }
+ }
+ this.selection.initRanges(selStrAr);
// this.firstIndex = Number($(this.prefix + ":f").rows[0].id.split(this.prefix)[1].split(":")[2]);;
var i = 0;
var j;
@@ -441,7 +449,7 @@
},
selectionChanged: function(event) {
- $(this.inputElement).value = this.selection.inspectRanges()+ (this.selectionFlag ? this.selectionFlag : "") ;
+ $(this.inputElement).value = this.selection.inspectRanges() + this.activeRow + ";" + (this.selectionFlag ? this.selectionFlag : "") ;
var state = this.selection.getState();
event.oldSelection = this.oldState;
event.newSelection = state;
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3013 - in trunk: ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-20 09:10:19 -0400 (Thu, 20 Sep 2007)
New Revision: 3013
Modified:
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-913
RF-974:
dayListMarkup - day cell markup
context object: {day, date, weekNumber, weekDayNumber, isWeekend, isCurrentMonth, elementId, component}
weekNumberMarkup - week number cell markup
context object: {weekNumber, elementId, component}
weekDayMarkup - week day cell markup
context object: {weekDayLabel, weekDayLabelShort, weekDayNumber, isWeekend, elementId, component}
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-09-20 12:07:32 UTC (rev 3012)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-09-20 13:10:19 UTC (rev 3013)
@@ -64,6 +64,7 @@
<f:facet name="optionalFooter">
<h:outputText value="optionalFooter Facet" />
</f:facet>
+
<f:validator validatorId="org.richfaces.CalendarValidator" />
<h:panelGrid columns="2">
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 2007-09-20 12:07:32 UTC (rev 3012)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-20 13:10:19 UTC (rev 3013)
@@ -378,10 +378,14 @@
initialize: function(id,parameters) {
// dayListTableId, weekNumberBarId, weekDayBarId - 3 tables ids',
+
// dayListMarkup - day cell markup
+ // context: {day, date, weekNumber, weekDayNumber, isWeekend, isCurrentMonth, elementId, component}
// weekNumberMarkup - week number cell markup
+ // context: {weekNumber, elementId, component}
// weekDayMarkup - week day cell markup
- // context: {weekDayLabel, weekDayLabelShort, weekDayNumber, componentId}
+ // context: {weekDayLabel, weekDayLabelShort, weekDayNumber, isWeekend, elementId, component}
+
// headerMarkup
// footerMarkup
// headerOptionalMarkup - user defined header (optional)
@@ -437,6 +441,8 @@
this.calendarContext = new CalendarContext(this);
this.DATE_ELEMENT_ID = this.params.dayListTableId+'Cell';
+ this.WEEKNUMBER_ELEMENT_ID = this.params.weekNumberBarId+'Cell';
+ this.WEEKDAY_ELEMENT_ID = this.params.weekDayBarId+'Cell';
this.POPUP_ID = this.id+'Popup';
this.POPUP_BUTTON_ID = this.id+'PopupButton';
this.INPUT_DATE_ID = this.id+'InputDate';
@@ -486,6 +492,7 @@
var styleClass;
var bottomStyleClass;
var htmlTextWeekDayBar='';
+ var context;
if (this.params.showWeekDaysBar)
{
var htmlTextWeekDayBar = '<tr id="'+this.params.weekDayBarId+'">';
@@ -493,14 +500,17 @@
var weekDayCounter = this.params.firstWeekDay;
for (var i=0;i<7;i++)
{
- var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayLabelShort: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} );
+ context = {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayLabelShort: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, isWeekend:this.isWeekend(i), elementId:this.WEEKDAY_ELEMENT_ID+i, component:this};
+ var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, context );
if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++;
-
+
styleClass = "rich-calendar-days";
- if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber) styleClass += " rich-calendar-weekends";
-
+ if (context.isWeekend)
+ {
+ styleClass += " rich-calendar-weekends";
+ }
if (i==6) styleClass += " rich-right-cell";
- htmlTextWeekDayBar+='<td class="'+styleClass+'">'+weekDayHtml+'</td>';
+ htmlTextWeekDayBar+='<td class="'+styleClass+'" id="'+context.elementId+'">'+weekDayHtml+'</td>';
}
htmlTextWeekDayBar+='</tr>\n';
}
@@ -515,8 +525,9 @@
htmlTextWeek+='<tr id="'+this.params.weekNumberBarId+k+'">';
if (this.params.showWeeksBar)
{
- var weekNumberHtml = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: k, componentId:this.getWeekNumberComponentId(k-1)} );
- htmlTextWeek+='<td class="rich-calendar-week '+bottomStyleClass+'">'+weekNumberHtml+'</td>';
+ context = {weekNumber: k, elementId:this.WEEKNUMBER_ELEMENT_ID+k, component:this};
+ var weekNumberHtml = this.evaluateMarkup(this.params.weekNumberMarkup, context );
+ htmlTextWeek+='<td class="rich-calendar-week '+bottomStyleClass+'" id="'+context.elementId+'">'+weekNumberHtml+'</td>';
}
// day cells creation
@@ -641,18 +652,6 @@
return true;
},
- getWeekDayComponentId: function (v) {
- return this.id+"WeekDay"+v;
- },
-
- getWeekNumberComponentId: function (v) {
- return this.id+"WeekNumber"+v;
- },
-
- getDateComponentId: function (v) {
- return this.id+"Date"+v;
- },
-
getCurrentDate: function() {
return this.currentDate;
},
@@ -809,8 +808,8 @@
if (daydata._month==-1) this.prevMonth(); else this.nextMonth();
else if (this.params.boundaryDatesMode == "select")
{
- var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.selectDate(date))
+ //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
+ if (this.selectDate(daydata.date))
{
this.doCollapse();
}
@@ -824,8 +823,8 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("datemouseover", obj, e, date))
+ //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
+ if (this.invokeEvent("datemouseover", obj, e, daydata.date))
{
if (daydata._month==0) Element.addClassName(obj,'rich-calendar-hover');
}
@@ -837,8 +836,8 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("datemouseout", obj, e, date))
+ //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
+ if (this.invokeEvent("datemouseout", obj, e, daydata.date))
{
if (daydata._month==0) Element.removeClassName(obj,'rich-calendar-hover');
}
@@ -915,7 +914,11 @@
var dayCounter = previousMonthDays - wd + 1;
// previuos month days
- if (wd>0) while (dayCounter<=previousMonthDays) {this.days.push({day:dayCounter, _isWeekend: this.isWeekend(p), _month:month}); dayCounter++; p++; }
+ if (wd>0) while (dayCounter<=previousMonthDays)
+ {
+ this.days.push({day:dayCounter, isWeekend: this.isWeekend(p), _month:month}); dayCounter++; p++;
+ }
+
dayCounter = 1;
month=0;
@@ -928,7 +931,7 @@
var firstDay = this.daysData.days[idx].day;
while (dayCounter<firstDay)
{
- this.days.push({day:dayCounter, _isWeekend:this.isWeekend(p%7), _month:month});
+ this.days.push({day:dayCounter, isWeekend:this.isWeekend(p%7), _month:month});
dayCounter++;
p++;
@@ -942,7 +945,7 @@
flag = this.isWeekend(p%7);
obj = this.daysData.days[idx];
obj.day = dayCounter;
- obj._isWeekend = flag;
+ obj.isWeekend = flag;
obj._month = month;
this.days.push(obj);
idx++;
@@ -953,7 +956,7 @@
while (p<42)
{
if (dayCounter>currentMonthDays) {dayCounter=1; month=1;}
- this.days.push({day:dayCounter, _isWeekend: this.isWeekend(p%7), _month:month});
+ this.days.push({day:dayCounter, isWeekend: this.isWeekend(p%7), _month:month});
dayCounter++;
p++;
}
@@ -1002,6 +1005,7 @@
var obj = $(this.params.weekNumberBarId+k);
element = obj.firstChild;
+ var weeknumber;
// week number update
if (this.params.showWeeksBar)
@@ -1013,10 +1017,13 @@
wn=1;
weekflag=false;
}
- element.innerHTML = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: wn++, componentId:this.getWeekNumberComponentId(k-1)} );
+ weeknumber = wn;
+ element.innerHTML = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: wn++, elementId:element.id, component:this} );
if (k==1&&wn>52) wn=1;
element = element.nextSibling;
}
+
+ var weekdaycounter = this.params.firstWeekDay;
while (element)
{
@@ -1024,7 +1031,13 @@
// TODO fix start/stop event's calls
this.stopCellEvents(element);
- dataobj.componentId=this.getDateComponentId(p);
+ dataobj.elementId=element.id;
+ dataobj.date=new Date(currentYear, currentMonth+dataobj._month, dataobj.day);
+ dataobj.weekNumber = weeknumber;
+ dataobj.component = this;
+ dataobj.isCurrentMonth = (dataobj._month==0);
+ dataobj.weekDayNumber = weekdaycounter;
+ if (weekdaycounter==6) weekdaycounter=0; else weekdaycounter++;
element.innerHTML = this.evaluateMarkup(this.params.dayListMarkup, dataobj );
// class styles
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3012 - trunk/ui/calendar/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-09-20 08:07:32 -0400 (Thu, 20 Sep 2007)
New Revision: 3012
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
Log:
default value for mode set to client
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-20 11:23:22 UTC (rev 3011)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-09-20 12:07:32 UTC (rev 3012)
@@ -462,7 +462,7 @@
<property>
<name>mode</name>
<classname>java.lang.String</classname>
- <defaultvalue>UICalendar.AJAX_MODE</defaultvalue>
+ <defaultvalue>UICalendar.CLIENT_MODE</defaultvalue>
<description>Valid values = ajax or client</description>
</property>
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3011 - trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-20 07:23:22 -0400 (Thu, 20 Sep 2007)
New Revision: 3011
Modified:
trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
Log:
http://jira.jboss.com/jira/browse/RF-903
Modified: trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss
===================================================================
--- trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-09-20 11:05:40 UTC (rev 3010)
+++ trunk/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-09-20 11:23:22 UTC (rev 3011)
@@ -7,6 +7,7 @@
<f:verbatim>
.dr-pmenu-top-group {
height: 20px;
+ width: 100%;
background-repeat: repeat-x;
background-position: left top;
padding: 2px 1px 2px 2px;
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3010 - trunk/test-applications/jsp/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-20 07:05:40 -0400 (Thu, 20 Sep 2007)
New Revision: 3010
Modified:
trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
Log:
Fix syntax error in JSP file
Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-20 10:18:00 UTC (rev 3009)
+++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-20 11:05:40 UTC (rev 3010)
@@ -17,7 +17,7 @@
<h:commandLink value="RichFaces" action="RichTest"></h:commandLink>
<h:commandLink value="Div" action="TestDiv"></h:commandLink>
<h:commandLink value="Select" action="Map"></h:commandLink>
- <h:commandLink value="Empty Page" action="EmptyPage></h:commandLink>
+ <h:commandLink value="Empty Page" action="EmptyPage"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3009 - trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-09-20 06:18:00 -0400 (Thu, 20 Sep 2007)
New Revision: 3009
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
http://jira.jboss.com/jira/browse/RF-915
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-19 17:39:03 UTC (rev 3008)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-20 10:18:00 UTC (rev 3009)
@@ -601,15 +601,8 @@
}
if (this.options.autosized) {
- var cWidth = eContentDiv.clientWidth;
- var cHeight = eContentDiv.clientHeight;
-
- eShadowDiv.style.width = cWidth+"px";
- eShadowDiv.style.height = cHeight+"px";
- if (eIframe) {
- eIframe.style.width = cWidth+"px";
- eIframe.style.height = cHeight+"px";
- }
+ this.observerSize =
+ window.setInterval(this.correctShadowSize.bindAsEventListener(this), 500);
}
this.doResizeOrMove(ModalPanel.Sizer.Diff.EMPTY);
@@ -632,7 +625,7 @@
this.shown = true;
},
-
+
startDrag: function(border) {
for (var k = 0; k < this.borders.length; k++ ) {
//this.borders[k].hide();
@@ -694,6 +687,10 @@
}
this.shown = false;
+
+ if (this.options.autosized) {
+ window.clearInterval(this.observerSize);
+ }
},
doResizeOrMove: function(diff) {
@@ -861,6 +858,22 @@
return true;
}
+ },
+
+ correctShadowSize: function(event) {
+ var eContentDiv = $(this.contentDiv);
+ var eShadowDiv = $(this.shadowDiv);
+ var eIframe = $(this.iframe);
+
+ var cWidth = eContentDiv.clientWidth;
+ var cHeight = eContentDiv.clientHeight;
+
+ eShadowDiv.style.width = cWidth+"px";
+ eShadowDiv.style.height = cHeight+"px";
+ if (eIframe) {
+ eIframe.style.width = cWidth+"px";
+ eIframe.style.height = cHeight+"px";
+ }
}
}
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3008 - in trunk/test-applications/facelets/src/main: java/emptyPage and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-19 13:39:03 -0400 (Wed, 19 Sep 2007)
New Revision: 3008
Added:
trunk/test-applications/facelets/src/main/java/emptyPage/
trunk/test-applications/facelets/src/main/java/emptyPage/EmptyPage.java
trunk/test-applications/facelets/src/main/webapp/EmptyPage/
trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
Modified:
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
Log:
has added page for test
Update Calendar and RichTest
Added: trunk/test-applications/facelets/src/main/java/emptyPage/EmptyPage.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/emptyPage/EmptyPage.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/emptyPage/EmptyPage.java 2007-09-19 17:39:03 UTC (rev 3008)
@@ -0,0 +1,17 @@
+package emptyPage;
+
+public class EmptyPage {
+ private String text = "text";
+
+ public EmptyPage () {
+
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+}
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-19 17:38:55 UTC (rev 3007)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -16,7 +16,9 @@
background-color: #0087FF;
}
</style>
-
+
+ <rich:messages showDetail="true"></rich:messages>
+
<f:verbatim>
<br />
</f:verbatim>
@@ -221,8 +223,6 @@
<f:verbatim></f:verbatim>
<h:commandButton value="Submit" />
-
- <rich:messages showDetail="true"></rich:messages>
</h:panelGrid>
<f:verbatim>
Added: trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <head>
+ <link rel="stylesheet"
+ href="#{facesContext.externalContext.requestContextPath}/styles/styles.css"
+ type="text/css" />
+ </head>
+ <f:view>
+ <h:form>
+ <rich:messages showDetail="true"></rich:messages>
+
+ <h:outputText value="#{emptyPage.text}" />
+
+ </h:form>
+ </f:view>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-19 17:38:55 UTC (rev 3007)
+++ trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -17,15 +17,109 @@
<f:facet name="header">
<h:outputText value="panel" />
</f:facet>
- <rich:tabPanel switchType="ajax">
- <rich:tab>
- <h:outputText value="Text" />
- </rich:tab>
- </rich:tabPanel>
+ <rich:tabPanel switchType="ajax" height="200px" width="300px">
+ <rich:tab label="Tab 1">
+ <f:facet name="header">
+ <h:outputText value="tab1" />
+ </f:facet>
+ <h:outputText value="Text" />
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:outputText value="Text" />
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:outputText value="Text" />
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:outputText value="Text" />
+ </rich:tab>
+
+ <rich:tab label="Tab 2">
+ <h:outputText value="Image" />
+ <h:graphicImage value="/pics/masshtaby_01.jpg" height="150px"
+ width="200px" />
+ </rich:tab>
+
+ <rich:tab label="Tab 3">
+ <f:facet name="header">
+ <h:outputText value="tab1" />
+ </f:facet>
+ <f:verbatim>
+ <a
+ href="javascript:Richfaces.showModalPanel('mp',{width:450, top:200})">Show
+ this panel</a>
+ </f:verbatim>
+ <rich:modalPanel id="mp" minHeight="200" minWidth="450"
+ height="200" width="500" zindex="2000">
+ <f:facet name="header">
+ <h:outputText value="Modal Panel Title" />
+ </f:facet>
+ <f:facet name="controls">
+ <h:graphicImage value="/pics/error.gif" style="cursor:pointer"
+ onclick="Richfaces.hideModalPanel('mp')" />
+ </f:facet>
+ <f:verbatim>
+ RichFaces Modal Panel is a container that blocks an operation on the base page when the modal panel is shown.
+ <a href="javascript:Richfaces.hideModalPanel('mp')">Hide
+ this panel</a>
+ </f:verbatim>
+ </rich:modalPanel>
+ </rich:tab>
+
+ <rich:tab label="Tab 4">
+ <f:facet name="header">
+ <h:outputText value="tab1" />
+ </f:facet>
+ <h:inputTextarea value="text" cols="30" rows="8"></h:inputTextarea>
+ </rich:tab>
+
+ <rich:tab label="Tab 5">
+ <f:facet name="header">
+ <h:outputText value="tab1" />
+ </f:facet>
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="Panel" />
+ </f:facet>
+ <rich:tabPanel switchType="ajax">
+ <rich:tab label="tab 1">
+ <h:outputText value="text1" />
+ </rich:tab>
+
+ <rich:tab label="tab 2">
+ <h:outputText value="text2" />
+ </rich:tab>
+ </rich:tabPanel>
+ </rich:panel>
+ </rich:tab>
+
+ <rich:tab label="Tab 6">
+ <rich:dataGrid columns="3" elements="12"
+ value="#{dataTable.mounths}" var="dt">
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="mmm"></h:outputText>
+ </f:facet>
+ <h:panelGrid columns="2">
+ <h:outputText value="Mounth:" styleClass="label"></h:outputText>
+ <h:outputText value="#{dt.mounth}" />
+ <h:outputText value="Town:" styleClass="label"></h:outputText>
+ <h:outputText value="#{dt.town}" />
+ <h:outputText value="Day:" styleClass="label"></h:outputText>
+ <h:outputText value="#{dt.day}" />
+ <h:outputText value="Number:" styleClass="label"></h:outputText>
+ <h:outputText value="#{dt.total}" />
+ </h:panelGrid>
+ </rich:panel>
+ </rich:dataGrid>
+ </rich:tab>
+ </rich:tabPanel>
</rich:panel>
</h:panelGrid>
<rich:separator></rich:separator>
-
</h:form>
</body>
</f:view>
Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>emptyPage</managed-bean-name>
+ <managed-bean-class>emptyPage.EmptyPage</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-19 17:38:55 UTC (rev 3007)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -128,6 +128,10 @@
<from-outcome>RichTest</from-outcome>
<to-view-id>/Rich/RichTest.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>EmptyPage</from-outcome>
+ <to-view-id>/EmptyPage/EmptyPage.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/Panel/Panel.xhtml</from-view-id>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-19 17:38:55 UTC (rev 3007)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -33,7 +33,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-EmptyPage.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-19 17:38:55 UTC (rev 3007)
+++ trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-19 17:39:03 UTC (rev 3008)
@@ -19,6 +19,7 @@
<h:commandLink value="Div" action="TestDiv"></h:commandLink>
<h:commandLink value="Select" action="Map"></h:commandLink>
<h:commandLink value="temp" action="RichTest"></h:commandLink>
+ <h:commandLink value="Empty page" action="EmptyPage"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3007 - in trunk/test-applications/jsp/src/main: java/emptyPage and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-19 13:38:55 -0400 (Wed, 19 Sep 2007)
New Revision: 3007
Added:
trunk/test-applications/jsp/src/main/java/emptyPage/
trunk/test-applications/jsp/src/main/java/emptyPage/EmptyPage.java
trunk/test-applications/jsp/src/main/webapp/EmptyPage/
trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
Log:
has added page for test
Update Calendar and RichTest
Added: trunk/test-applications/jsp/src/main/java/emptyPage/EmptyPage.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/emptyPage/EmptyPage.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/emptyPage/EmptyPage.java 2007-09-19 17:38:55 UTC (rev 3007)
@@ -0,0 +1,17 @@
+package emptyPage;
+
+public class EmptyPage {
+ private String text = "text";
+
+ public EmptyPage () {
+
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+}
Added: trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/EmptyPage/EmptyPage.jsp 2007-09-19 17:38:55 UTC (rev 3007)
@@ -0,0 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<f:view>
+<html>
+<head>
+<title></title>
+<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
+</head>
+<body>
+ <h:form>
+ <rich:messages showDetail="true"></rich:messages>
+
+ <h:outputText value="#{emptyPage.text}" />
+
+ </h:form>
+</body>
+</html>
+</f:view>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-19 17:38:55 UTC (rev 3007)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>emptyPage</managed-bean-name>
+ <managed-bean-class>emptyPage.EmptyPage</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-19 16:54:06 UTC (rev 3006)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-19 17:38:55 UTC (rev 3007)
@@ -124,6 +124,10 @@
<from-outcome>Map</from-outcome>
<to-view-id>/pages/Map.jsp</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>EmptyPage</from-outcome>
+ <to-view-id>/EmptyPage/EmptyPage.jsp</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>*</from-view-id>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-19 16:54:06 UTC (rev 3006)
+++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-09-19 17:38:55 UTC (rev 3007)
@@ -17,6 +17,7 @@
<h:commandLink value="RichFaces" action="RichTest"></h:commandLink>
<h:commandLink value="Div" action="TestDiv"></h:commandLink>
<h:commandLink value="Select" action="Map"></h:commandLink>
+ <h:commandLink value="Empty Page" action="EmptyPage></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r3006 - in trunk: extensions/gwt and 34 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-19 12:54:06 -0400 (Wed, 19 Sep 2007)
New Revision: 3006
Modified:
trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
trunk/extensions/gwt/pom.xml
trunk/extensions/seam/pom.xml
trunk/extensions/trinidad/pom.xml
trunk/framework/api-parent/pom.xml
trunk/framework/impl-parent/pom.xml
trunk/framework/impl/pom.xml
trunk/samples/ajaxPortlet/pom.xml
trunk/samples/pom.xml
trunk/samples/portal-echo/pom.xml
trunk/samples/richfaces-art-datatable/pom.xml
trunk/samples/richfaces-ear-demo/ejb/pom.xml
trunk/samples/richfaces-ear-demo/pom.xml
trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
trunk/samples/richfaces-ear-demo/webapp/pom.xml
trunk/samples/scrollableDataTableDemo/pom.xml
trunk/samples/seamEAR/ear/pom.xml
trunk/samples/seamEAR/ejbs/pom.xml
trunk/samples/seamEAR/pom.xml
trunk/samples/seamEAR/primary-source/pom.xml
trunk/samples/seamEAR/projects/logging/pom.xml
trunk/samples/seamEAR/projects/pom.xml
trunk/samples/seamEAR/wars/pom.xml
trunk/samples/seamEAR/wars/seamWebapp/pom.xml
trunk/samples/seamIntegration/pom.xml
trunk/samples/tomahawkCompability/pom.xml
trunk/samples/useCases/pom.xml
trunk/samples/virtualEarth-sample/pom.xml
trunk/sandbox/samples/dialog-window-sample/pom.xml
trunk/sandbox/samples/rich-message-demo/pom.xml
trunk/sandbox/ui/dialog-window/pom.xml
trunk/test-applications/facelets/pom.xml
trunk/test-applications/jsp/pom.xml
trunk/test-applications/pom.xml
trunk/ui/dataTable/pom.xml
trunk/ui/drag-drop/pom.xml
Log:
fix all dependences references to 3.2.0-SNAPSHOT.
Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -10,7 +10,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<configuration>
<library>
<prefix>${groupId}</prefix>
Modified: trunk/extensions/gwt/pom.xml
===================================================================
--- trunk/extensions/gwt/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/extensions/gwt/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -3,7 +3,7 @@
<parent>
<artifactId>master</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
Modified: trunk/extensions/seam/pom.xml
===================================================================
--- trunk/extensions/seam/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/extensions/seam/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
Modified: trunk/extensions/trinidad/pom.xml
===================================================================
--- trunk/extensions/trinidad/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/extensions/trinidad/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>ajax4jsf</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
Modified: trunk/framework/api-parent/pom.xml
===================================================================
--- trunk/framework/api-parent/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/framework/api-parent/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,13 +4,13 @@
<parent>
<artifactId>framework</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<packaging>pom</packaging>
<artifactId>api-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>Java Server Faces AJAX framework API Dependencies</name>
<properties>
<jsfVersion>1.1</jsfVersion>
Modified: trunk/framework/impl/pom.xml
===================================================================
--- trunk/framework/impl/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/framework/impl/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -3,7 +3,7 @@
<parent>
<artifactId>impl-parent</artifactId>
<groupId>org.richfaces.framework</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../impl-parent/pom.xml</relativePath>
</parent>
-->
Modified: trunk/framework/impl-parent/pom.xml
===================================================================
--- trunk/framework/impl-parent/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/framework/impl-parent/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -5,12 +5,12 @@
<parent>
<artifactId>framework</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>impl-parent</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>
Java Server Faces AJAX framework implementation parent file
@@ -203,7 +203,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
<properties>
Modified: trunk/samples/ajaxPortlet/pom.xml
===================================================================
--- trunk/samples/ajaxPortlet/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/ajaxPortlet/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -5,12 +5,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>portalAjaxSample</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<description>Ajax JSF sample portlet</description>
<build>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.richfaces.extensions</groupId>
<artifactId>portlet</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -361,7 +361,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: trunk/samples/portal-echo/pom.xml
===================================================================
--- trunk/samples/portal-echo/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/portal-echo/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -5,13 +5,13 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>portal-echo</artifactId>
<packaging>war</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<description>Ajax JSF sample portlet</description>
<build>
<defaultGoal>package</defaultGoal>
Modified: trunk/samples/richfaces-art-datatable/pom.xml
===================================================================
--- trunk/samples/richfaces-art-datatable/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/richfaces-art-datatable/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -3,19 +3,19 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>richfaces-art-datatable</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>richfaces-art-datatableDemo Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: trunk/samples/richfaces-ear-demo/ejb/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/richfaces-ear-demo/ejb/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,14 +4,14 @@
<parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>ejb</artifactId>
<packaging>ejb</packaging>
<name>ejb</name>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: trunk/samples/richfaces-ear-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/richfaces-ear-demo/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,14 +4,14 @@
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>richfaces-ear-demo</artifactId>
<name>JSF 1.2/Jee5 enterprise application demo</name>
<packaging>pom</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<build>
<pluginManagement>
<plugins>
Modified: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,32 +4,32 @@
<parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>richfacesEAR</artifactId>
<name>richfacesEAR</name>
<packaging>ear</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>ejb</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>ejb</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>ejb-client</type>
</dependency>
<dependency>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>webapp</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: trunk/samples/richfaces-ear-demo/webapp/pom.xml
===================================================================
--- trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/richfaces-ear-demo/webapp/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,14 +4,14 @@
<parent>
<artifactId>richfaces-ear-demo</artifactId>
<groupId>org.richfaces.samples</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>webapp</artifactId>
<packaging>war</packaging>
<name>webapp Maven Webapp</name>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<build>
<finalName>webapp</finalName>
@@ -48,17 +48,17 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.richfaces.samples.richfaces-ear-demo</groupId>
<artifactId>ejb</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>ejb-client</type>
<scope>provided</scope>
<optional>true</optional>
Modified: trunk/samples/scrollableDataTableDemo/pom.xml
===================================================================
--- trunk/samples/scrollableDataTableDemo/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/scrollableDataTableDemo/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,34 +4,34 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>scrollableDataTableDemo</artifactId>
<groupId>org.richfaces.samples</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>scrollableDataTable Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>scrollableDataTable</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/samples/seamEAR/ear/pom.xml
===================================================================
--- trunk/samples/seamEAR/ear/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/ear/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -6,18 +6,18 @@
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>ear</artifactId>
<packaging>ear</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>ear assembly</name>
<parent>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamEAR</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: trunk/samples/seamEAR/ejbs/pom.xml
===================================================================
--- trunk/samples/seamEAR/ejbs/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/ejbs/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -6,12 +6,12 @@
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>ejbs</artifactId>
<packaging>ejb</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>enterprise java beans</name>
<parent>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamEAR</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.faces</groupId>
Modified: trunk/samples/seamEAR/pom.xml
===================================================================
--- trunk/samples/seamEAR/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -6,12 +6,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<artifactId>seamEAR</artifactId>
<packaging>pom</packaging>
<name>seam EAR project</name>
@@ -58,23 +58,23 @@
org.richfaces.samples.seamEAR.projects
</groupId>
<artifactId>logging</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>primary-source</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples.seamEAR.wars</groupId>
<artifactId>seamWebapp</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>ejbs</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>ejb</type>
</dependency>
</dependencies>
Modified: trunk/samples/seamEAR/primary-source/pom.xml
===================================================================
--- trunk/samples/seamEAR/primary-source/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/primary-source/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamEAR</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Modified: trunk/samples/seamEAR/projects/logging/pom.xml
===================================================================
--- trunk/samples/seamEAR/projects/logging/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/projects/logging/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -7,6 +7,6 @@
<parent>
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>projects</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
</project>
Modified: trunk/samples/seamEAR/projects/pom.xml
===================================================================
--- trunk/samples/seamEAR/projects/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/projects/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -1,14 +1,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples.seamEAR</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<artifactId>projects</artifactId>
<packaging>pom</packaging>
<name>sub projects</name>
<parent>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamEAR</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modules>
<module>logging</module>
Modified: trunk/samples/seamEAR/wars/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/wars/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,11 +4,11 @@
<artifactId>wars</artifactId>
<packaging>pom</packaging>
<name>wars</name>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<parent>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamEAR</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modules>
<module>seamWebapp</module>
Modified: trunk/samples/seamEAR/wars/seamWebapp/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.richfaces.samples.seamEAR</groupId>
<artifactId>wars</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<build>
<finalName>seamWebapp</finalName>
@@ -42,17 +42,17 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/seamIntegration/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -5,14 +5,14 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamIntegration</artifactId>
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<build>
<finalName>seamIntegration</finalName>
<plugins>
Modified: trunk/samples/tomahawkCompability/pom.xml
===================================================================
--- trunk/samples/tomahawkCompability/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/tomahawkCompability/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>tomahawkCompability</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>tomahawkCompability Maven Webapp</name>
<properties>
Modified: trunk/samples/useCases/pom.xml
===================================================================
--- trunk/samples/useCases/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/useCases/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -5,12 +5,12 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>useCases</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>useCases Maven Webapp</name>
<build>
Modified: trunk/samples/virtualEarth-sample/pom.xml
===================================================================
--- trunk/samples/virtualEarth-sample/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/samples/virtualEarth-sample/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -4,19 +4,19 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>virtualEarth-sample</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>gmap-sample Maven Webapp</name>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>virtualEarth</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: trunk/sandbox/samples/dialog-window-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/dialog-window-sample/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/sandbox/samples/dialog-window-sample/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces.sandbox</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>dialog-window</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/sandbox/samples/rich-message-demo/pom.xml
===================================================================
--- trunk/sandbox/samples/rich-message-demo/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/sandbox/samples/rich-message-demo/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces.sandbox</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.demo</groupId>
@@ -13,17 +13,17 @@
<dependency>
<groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>message</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>skins</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/sandbox/ui/dialog-window/pom.xml
===================================================================
--- trunk/sandbox/ui/dialog-window/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/sandbox/ui/dialog-window/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>ui</artifactId>
<groupId>org.richfaces.sandbox</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.sandbox.ui</groupId>
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: trunk/test-applications/facelets/pom.xml
===================================================================
--- trunk/test-applications/facelets/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/test-applications/facelets/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>test-applications</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-applications/jsp/pom.xml
===================================================================
--- trunk/test-applications/jsp/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/test-applications/jsp/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>test-applications</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-applications/pom.xml
===================================================================
--- trunk/test-applications/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/test-applications/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -2,7 +2,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath>../samples</relativePath>
</parent>
@@ -43,11 +43,11 @@
<groupId>org.richfaces</groupId>
<artifactId>test-applications</artifactId>
<packaging>pom</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<name>RichFaces Test Applications</name>
<properties>
- <rfVersion>3.1.1-SNAPSHOT</rfVersion>
+ <rfVersion>3.2.0-SNAPSHOT</rfVersion>
</properties>
<modules>
Modified: trunk/ui/dataTable/pom.xml
===================================================================
--- trunk/ui/dataTable/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/ui/dataTable/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-core</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
-->
</dependencies>
Modified: trunk/ui/drag-drop/pom.xml
===================================================================
--- trunk/ui/drag-drop/pom.xml 2007-09-19 16:43:17 UTC (rev 3005)
+++ trunk/ui/drag-drop/pom.xml 2007-09-19 16:54:06 UTC (rev 3006)
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-core</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
-->
</dependencies>
18 years, 7 months
- 1
- 0