JBoss Rich Faces SVN: r10694 - in trunk/samples/columnsDemo/src/main/java/org/richfaces: samples and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-08 09:07:00 -0400 (Wed, 08 Oct 2008)
New Revision: 10694
Added:
trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/
trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Bean.java
trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Column.java
Removed:
trunk/samples/columnsDemo/src/main/java/org/richfaces/sandbox/
Log:
Demo update
Added: trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Bean.java
===================================================================
--- trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Bean.java (rev 0)
+++ trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Bean.java 2008-10-08 13:07:00 UTC (rev 10694)
@@ -0,0 +1,134 @@
+/*
+ * Bean.java Date created: 08.10.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.richfaces.samples;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.event.ActionEvent;
+
+/**
+ * Sample session bean
+ * @author Andrey
+ *
+ */
+public class Bean {
+
+ List<Column> columns;
+
+ List<List<String>> data;
+
+ Integer rowsCount;
+
+ Boolean name;
+
+ Boolean type;
+
+ Boolean description;
+
+
+ public Bean() {
+ rowsCount = 5;
+ name = true;
+ type = true;
+ description = true;
+ init();
+ }
+
+ public void apply(ActionEvent event) {
+ init();
+ }
+
+ private void init() {
+ // Init columns
+ columns = new ArrayList<Column>();
+ columns.add(new Column("#"));
+
+ if (name) {
+ columns.add(new Column("Name"));
+ }
+ if (type) {
+ columns.add(new Column("Type"));
+ }
+ if (description) {
+ columns.add(new Column("Description"));
+ }
+
+ //Init model
+ data = new ArrayList<List<String>>();
+ for (int i = 0; i < rowsCount; i++) {
+ data.add(getRow(i));
+ }
+ }
+
+ private List<String> getRow(int row) {
+ List<String> list = new ArrayList<String>();
+ list.add(String.valueOf(row));
+ if (name) {
+ list.add(String.valueOf(Math.random()));
+ }
+
+ if (type) {
+ int i = new Double(Math.random() * 10.0).intValue();
+ if (i <= 3) {
+ list.add("txt");
+ }else if (i <= 6) {
+ list.add("jpeg");
+ }else if (i <= 10) {
+ list.add("xml");
+ }
+ }
+
+ if (description) {
+ list.add("");
+ }
+
+ return list;
+ }
+
+ public List<Column> getColumns() {
+ return columns;
+ }
+
+ public List<List<String>> getData() {
+ return data;
+ }
+
+ public Boolean getName() {
+ return name;
+ }
+
+ public void setName(Boolean name) {
+ this.name = name;
+ }
+
+ public Boolean getType() {
+ return type;
+ }
+
+ public void setType(Boolean type) {
+ this.type = type;
+ }
+
+ public Boolean getDescription() {
+ return description;
+ }
+
+ public void setDescription(Boolean description) {
+ this.description = description;
+ }
+
+ public Integer getRowsCount() {
+ return rowsCount;
+ }
+
+ public void setRowsCount(Integer rowsCount) {
+ this.rowsCount = rowsCount;
+ }
+
+}
Added: trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Column.java
===================================================================
--- trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Column.java (rev 0)
+++ trunk/samples/columnsDemo/src/main/java/org/richfaces/samples/Column.java 2008-10-08 13:07:00 UTC (rev 10694)
@@ -0,0 +1,52 @@
+/*
+ * Column.java Date created: 08.10.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.richfaces.samples;
+
+import org.richfaces.model.Ordering;
+
+/**
+ * Column sample model
+ * @author Andrey
+ *
+ */
+public class Column {
+
+ String name;
+
+ Ordering ordering;
+
+ String filterValue;
+
+ public Column(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Ordering getOrdering() {
+ return ordering;
+ }
+
+ public void setOrdering(Ordering ordering) {
+ this.ordering = ordering;
+ }
+
+ public String getFilterValue() {
+ return filterValue;
+ }
+
+ public void setFilterValue(String filterValue) {
+ this.filterValue = filterValue;
+ }
+
+}
16 years, 1 month
JBoss Rich Faces SVN: r10693 - in trunk/samples/columnsDemo/src/main/webapp: WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-08 08:59:59 -0400 (Wed, 08 Oct 2008)
New Revision: 10693
Modified:
trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml
trunk/samples/columnsDemo/src/main/webapp/index.jsp
trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
Log:
Update column demo
Modified: trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-10-08 11:31:59 UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/WEB-INF/faces-config.xml 2008-10-08 12:59:59 UTC (rev 10693)
@@ -4,14 +4,10 @@
<faces-config>
<managed-bean>
<managed-bean-name>bean</managed-bean-name>
- <managed-bean-class>org.richfaces.sandbox.samples.Bean</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
+ <managed-bean-class>org.richfaces.samples.Bean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <managed-bean>
- <managed-bean-name>columns</managed-bean-name>
- <managed-bean-class>org.richfaces.sandbox.samples.Columns</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
+
<navigation-rule>
<display-name>xhtml</display-name>
<navigation-case>
Modified: trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml 2008-10-08 11:31:59 UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/WEB-INF/web.xml 2008-10-08 12:59:59 UTC (rev 10693)
@@ -26,7 +26,20 @@
<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
</context-param>
-
+
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_STYLE</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <!--context-param>
+ <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
+ <param-value>TIDY</param-value>
+ </context-param-->
<!--
-->
<filter>
@@ -42,7 +55,7 @@
<dispatcher>INCLUDE</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <!-- Faces Servlet -->
+ <!-- Faces Servlet -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: trunk/samples/columnsDemo/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/index.jsp 2008-10-08 11:31:59 UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/index.jsp 2008-10-08 12:59:59 UTC (rev 10693)
@@ -6,7 +6,9 @@
<body>
<a href="faces/pages/index.jsp">JSP</a><br/>
- <a href="faces/pages/index.xhtml">XHTML</a>
+ <a href="faces/pages/index.xhtml">XHTML</a><br/>
+ <a href="faces/pages/test.jsp">TestJSP</a>
+ <a href="faces/pages/test.xhtml">TestXHTML</a>
</body>
</html>
\ No newline at end of file
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp 2008-10-08 11:31:59 UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.jsp 2008-10-08 12:59:59 UTC (rev 10693)
@@ -1,3 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
@@ -7,45 +9,71 @@
<html>
- <head>
- <title></title>
- </head>
<body>
<f:view>
- <h:form>
+ <h3>Test Facelets</h3>
+ <br/><br/>
+ <h:form id="_form">
+ <table>
+ <tr>
+ <td>Row Count:</td>
+ <td>
+ <h:inputText value="#{bean.rowsCount}">
+ <a4j:support event="onchange" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>Name:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.name}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Type:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.type}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Description:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.description}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+
+ <dt:dataTable id="_data" value="#{bean.data}" var="row">
+ <dt:column sortBy="#{row[0]}">
+ <f:facet name="header">
+ <h:outputText value="#"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[0]}"></h:outputText>
+ </dt:column>
+ <columns:columns value="#{bean.columns}" var="column" index="index" begin="2"
+ sortBy="#{row[index]}" sortOrder="#{column.ordering}"
+ filterBy="#{row[index]}" filterValue="#{column.filterValue}" filterEvent="onkeyup">
+ <f:facet name="header">
+ <h:outputText value="#{column.name}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[index]}" rendered="#{column.name != 'Description'}"></h:outputText>
+ <h:inputText value="#{row[index]}" rendered="#{column.name eq 'Description'}"></h:inputText>
+ </columns:columns>
+ </dt:dataTable>
+ <br/>
+ <a4j:commandLink value="Ajax Submit" reRender="_data"></a4j:commandLink><br/>
+ <h:commandLink value="Form Submit" action="xhtml"></h:commandLink>
+
+ </h:form>
- Columns: <h:inputText value="#{bean.columnsCountStr}"></h:inputText> <br/>
- Rows: <h:inputText value="#{bean.rowCountStr}"></h:inputText> <br/>
-
-
- <a4j:commandButton value="Submit" action="#{bean.jsp}" reRender="tb"></a4j:commandButton>
-
- <br/>
-
-
- <dt:dataTable value="#{bean.model}" var="var" id="tb">
- <columns:columns value="#{bean.columns}" var="col" index="counter"
- style="color: Green;">
- <f:facet name="header">
- <h:outputText value="#{col.header}"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="#{col.footer}"></h:outputText>
- </f:facet>
- <h:outputText value="#{var[counter]}"></h:outputText>
- <h:inputText value="#{var[counter]}"></h:inputText>
- </columns:columns>
- </dt:dataTable>
-
- <dt:dataTable value="#{bean.model}" var="var" id="tb2">
- <columns:columns end="#{bean.columnsCountStr}" var="col" index="counter"
- style="color: Red;" width="100px;">
- <h:outputText value="#{var[counter]}"></h:outputText>
- </columns:columns>
- </dt:dataTable>
-
-
- </h:form>
- </f:view>
+ </f:view>
</body>
</html>
Modified: trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2008-10-08 11:31:59 UTC (rev 10692)
+++ trunk/samples/columnsDemo/src/main/webapp/pages/index.xhtml 2008-10-08 12:59:59 UTC (rev 10693)
@@ -8,57 +8,67 @@
xmlns:dt="http://labs.jboss.com/jbossrichfaces/ui/dataTable"
xmlns:columns="http://labs.jboss.com/jbossrichfaces/ui/columns">
<f:view>
- XHTML
- <h:form>
-
-
- Columns: <h:inputText value="#{bean.columnsCountStr}"></h:inputText> <br/>
- Rows: <h:inputText value="#{bean.rowCountStr}"></h:inputText> <br/>
-
-
- <a4j:commandButton value="Submit" action="#{bean.xhtml}" reRender="tb"></a4j:commandButton>
-
- <br/>
-
-
- <dt:dataTable value="#{bean.model}" var="var" id="tb">
- <dt:column>
- <f:facet name="header">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <h:outputText value="crack"></h:outputText>
- </dt:column>
- <columns:columns value="#{bean.columns}" var="col" index="counter"
- style="color: Blue; text-align: right;" width="200px;"
- begin="0" end="10"
- sortBy="#{var[counter]}" sortOrder="#{col.ordering}">
- <f:facet name="header">
- <h:outputText value="#{col.header}"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="#{col.footer}"></h:outputText>
- </f:facet>
- <h:outputText value="#{var[counter]}"></h:outputText>
- </columns:columns>
+ <h3>Test Facelets</h3>
+ <br/><br/>
+ <h:form id="_form">
+ <table>
+ <tr>
+ <td>Row Count:</td>
+ <td>
+ <h:inputText value="#{bean.rowsCount}">
+ <a4j:support event="onchange" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <td>Name:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.name}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Type:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.type}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ <tr>
+ <td>Description:</td>
+ <td>
+ <h:selectBooleanCheckbox value="#{bean.description}">
+ <a4j:support event="onclick" actionListener="#{bean.apply}" reRender="_data"></a4j:support>
+ </h:selectBooleanCheckbox>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+
+ <dt:dataTable id="_data" value="#{bean.data}" var="row">
+ <dt:column sortBy="#{row[0]}">
+ <f:facet name="header">
+ <h:outputText value="#"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[0]}"></h:outputText>
+ </dt:column>
+ <columns:columns value="#{bean.columns}" var="column" index="index" begin="2"
+ sortBy="#{row[index]}" sortOrder="#{column.ordering}"
+ filterBy="#{row[index]}" filterValue="#{column.filterValue}" filterEvent="onkeyup">
+ <f:facet name="header">
+ <h:outputText value="#{column.name}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{row[index]}" rendered="#{column.name != 'Description'}"></h:outputText>
+ <h:inputText value="#{row[index]}" rendered="#{column.name eq 'Description'}"></h:inputText>
+ </columns:columns>
+ </dt:dataTable>
+ <br/>
+ <a4j:commandLink value="Ajax Submit" reRender="_data"></a4j:commandLink><br/>
+ <h:commandLink value="Form Submit" action="xhtml"></h:commandLink>
- <dt:column>
- <f:facet name="header">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="crack"></h:outputText>
- </f:facet>
- <h:outputText value="crack"></h:outputText>
- </dt:column>
- </dt:dataTable>
-
- <h:commandButton value="Submit" action="xhtml"></h:commandButton>
-
- </h:form>
-
+ </h:form>
</f:view>
-
</html>
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r10692 - in trunk/ui/columns/src/main/java/org/richfaces: iterator and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-08 07:31:59 -0400 (Wed, 08 Oct 2008)
New Revision: 10692
Modified:
trunk/ui/columns/src/main/java/org/richfaces/el/ELBuilder.java
trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java
trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
Log:
Refactoring
Modified: trunk/ui/columns/src/main/java/org/richfaces/el/ELBuilder.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/el/ELBuilder.java 2008-10-08 11:02:59 UTC (rev 10691)
+++ trunk/ui/columns/src/main/java/org/richfaces/el/ELBuilder.java 2008-10-08 11:31:59 UTC (rev 10692)
@@ -1,3 +1,9 @@
+/*
+ * ELBuilder.java Date created: 08.10.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
package org.richfaces.el;
import javax.el.ELContext;
@@ -4,25 +10,53 @@
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Class provides EL parsing for filter and sort attributes of columns component.
+ * @author Andrey Markavtsov
+ *
+ */
public class ELBuilder {
+
+ /** Log */
+ Log log = LogFactory.getLog(ELBuilder.class);
+
+ /** Original value expression string */
String orig;
+ /** Result buffer */
StringBuffer res = new StringBuffer("#{");
int l;
+ /** Columns var string */
String var;
+ /** Columns index string */
String index;
+ /** Replacement to change var string */
String varReplacement;
+ /** Replacement to change index string */
String indexReplacement;
int varL;
int indexL;
+
+
+ /**
+ * Constructor
+ * @param orig - original value expression string
+ * @param var - columns var string
+ * @param index - columns index string
+ * @param varR - replacement for var
+ * @param indexR - replacement for index
+ */
public ELBuilder(String orig, String var, String index, String varR,
String indexR) {
this.orig = trimEL(orig);
@@ -36,12 +70,33 @@
}
+ /**
+ * Parsing method
+ * @return String parsing result
+ */
public String parse() {
- internalParse(orig);
- res.append("}");
+ try {
+ internalParse(orig);
+ res.append("}");
+ }catch (Exception e) {
+ log.error("Error occured during ValueExpression parsing. Keep old expression. " + e);
+ res.append(orig);
+ }
return res.toString();
}
+ /**
+ * Creates new expression using replacements provided
+ * @param expr - original expression
+ * @param expectedType - expected type
+ * @param factory - expression factory
+ * @param elContext - El context
+ * @param var - var string
+ * @param index - index string
+ * @param varR - replacement for var
+ * @param indexR - replacement for index
+ * @return
+ */
public static ValueExpression createValueExpression (String expr, Class<?> expectedType,ExpressionFactory factory, ELContext elContext, String var, String index, String varR,
String indexR) {
ELBuilder builder = new ELBuilder(expr, var, index, varR, indexR);
@@ -49,6 +104,11 @@
return factory.createValueExpression(elContext, newExpr, expectedType);
}
+ /**
+ * Removes '#', '{', '}' chars from expression
+ * @param orig - original expression
+ * @return
+ */
public static String trimEL(String orig) {
if (orig.trim().startsWith("#")) {
orig = orig.substring(1).trim();
Modified: trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java 2008-10-08 11:02:59 UTC (rev 10691)
+++ trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java 2008-10-08 11:31:59 UTC (rev 10692)
@@ -17,4 +17,6 @@
public boolean hasNext() throws JspTagException;
public Object next() throws JspTagException;
+
+ public String getVarReplacement();
}
Modified: trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2008-10-08 11:02:59 UTC (rev 10691)
+++ trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2008-10-08 11:31:59 UTC (rev 10692)
@@ -201,6 +201,8 @@
// local adapter
class EnumerationAdapter implements ForEachIterator {
private Enumeration e;
+
+ private Object o;
public EnumerationAdapter(Enumeration e) {
this.e = e;
@@ -211,8 +213,15 @@
}
public Object next() {
- return e.nextElement();
+ o = e.nextElement();
+ return o;
}
+
+ public String getVarReplacement() {
+ if (o != null)
+ return o.toString();
+ return null;
+ }
}
return new EnumerationAdapter(e);
@@ -240,4 +249,9 @@
return i.next();
}
+
+ public String getVarReplacement() {
+ return null;
+ }
+
}
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2008-10-08 11:02:59 UTC (rev 10691)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2008-10-08 11:31:59 UTC (rev 10692)
@@ -107,6 +107,11 @@
public String valueExpr;
public String getVarReplacement() {
+ if (valueExpr == null) {
+ return String.valueOf(index);
+ }else if (items.getVarReplacement() != null) {
+ return items.getVarReplacement();
+ }
return valueExpr + "[" + _index + "]";
}
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-10-08 11:02:59 UTC (rev 10691)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-10-08 11:31:59 UTC (rev 10692)
@@ -89,6 +89,7 @@
/** Column incrementer */
private Integer counter = 0;
+
/**
* style CSS style(s) is/are to be applied when this component is rendered
@@ -341,7 +342,6 @@
@Override
protected void setProperties(UIComponent component) {
ELContext elContext = getContext(pageContext.getELContext());
- String varReplacement = ELBuilder.trimEL(this.__value.getExpressionString()) + "[" + index + "]";
Field[] fields = this.getClass().getDeclaredFields();
for (Field field : fields) {
try {
@@ -361,7 +361,7 @@
if (!ex.isLiteralText()) {
expr = ELBuilder.createValueExpression(ex.getExpressionString(), ex.getExpectedType(),
getFacesContext().getApplication().getExpressionFactory(), pageContext.getELContext(), itemId, indexId,
- varReplacement, String.valueOf(index));
+ getVarReplacement(), String.valueOf(index));
}else {
expr = ex;
}
@@ -387,13 +387,24 @@
if (_sortExpression != null) {
ValueExpression expr = ELBuilder.createValueExpression(_sortExpression.getExpressionString(), _sortExpression.getExpectedType(),
getFacesContext().getApplication().getExpressionFactory(), pageContext.getELContext(), itemId, indexId,
- varReplacement, String.valueOf(index));
+ getVarReplacement(), String.valueOf(index));
component.setValueExpression("sortExpression", expr);
}
}
+ private String getVarReplacement() {
+ if (this.__value == null) {
+ return String.valueOf(index);
+ } else if (items.getVarReplacement() != null) {
+ return items.getVarReplacement();
+ }
+ String varReplacement = ELBuilder.trimEL(this.__value.getExpressionString())
+ + "[" + index + "]";
+ return varReplacement;
+ }
+
/**
* Evaluates expression string for SortExpression attribute using resolved vars nodes.
* @return
@@ -787,7 +798,7 @@
pageContext.removeAttribute(indexId, PageContext.PAGE_SCOPE);
else {
IteratedIndexExpression indexExpression = new IteratedIndexExpression(
- index - begin);
+ index);
VariableMapper vm = pageContext.getELContext()
.getVariableMapper();
if (vm != null) {
16 years, 1 month
JBoss Rich Faces SVN: r10691 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-10-08 07:02:59 -0400 (Wed, 08 Oct 2008)
New Revision: 10691
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
https://jira.jboss.org/jira/browse/RF-2799 - info about Prototype 1.6.0.3, jQuery 1.2.6 and Script.aculo.us 1.8.1 is added to the " Basic concepts of the RichFaces Framework" section
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-10-08 10:40:33 UTC (rev 10690)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-10-08 11:02:59 UTC (rev 10691)
@@ -121,6 +121,41 @@
automatically. </para>
</formalpara>
</section>
+ <section id="IntegralParts" role="new">
+ <?dbhtml filename="IntegralParts.html"?>
+ <title>RichFaces Integral Parts</title>
+ <para>
+ The <property>RichFaces</property> comes with a number of integral parts (framework, libraries):
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ulink url="http://prototypejs.org">Prototype 1.6.0.3</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jquery.com">jQuery 1.2.6</ulink>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://script.aculo.us">Script.aculo.us 1.8.1</ulink>
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ For more information about framework and libraries loading see the following section
+ in the <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">FAQ</ulink>.
+ </para>
+ <note>
+ <title>Note:</title>
+ <para>
+ In order to prevent JavaScript versions conflict you should use only one version of the framework or library.
+ You could find more information about libraries exclusion in the <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">FAQ</ulink>.
+ </para>
+ </note>
+ </section>
<section id="LimitationsAndRules">
<?dbhtml filename="LimitationAndRules.html"?>
<title>Limitations and Rules</title>
16 years, 1 month
JBoss Rich Faces SVN: r10690 - trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-10-08 06:40:33 -0400 (Wed, 08 Oct 2008)
New Revision: 10690
Modified:
trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
Log:
base component js class
Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
===================================================================
--- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-08 09:10:54 UTC (rev 10689)
+++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-10-08 10:40:33 UTC (rev 10690)
@@ -0,0 +1,19 @@
+if (!Richfaces) Richfaces = {};
+Richfaces.Editor = {};
+Richfaces.Editor.getResourceURL = function (baseURL, type) {
+ return Richfaces.Editor.ResourceHTML.replace("$1", baseURL);
+};
+
+Richfaces.Editor.ResourceHTML = "ghdfgsdfgsdfgsdfgdf sg sdfg$1fgsdfdfgdfg";
+
+RichEditor = Class.create();
+Object.extend(RichEditor.prototype, {
+ initialize: function(id,parameters) {
+ this["rich:destructor"] = "destructor";
+ },
+ destructor: function()
+ {
+
+ }
+});
+
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r10689 - trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: pkawiak
Date: 2008-10-08 05:10:54 -0400 (Wed, 08 Oct 2008)
New Revision: 10689
Modified:
trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java
Log:
Fixed a bug with component ignoring bound selection.
Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java 2008-10-08 09:06:41 UTC (rev 10688)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/renderkit/html/TableSelectionRendererContributor.java 2008-10-08 09:10:54 UTC (rev 10689)
@@ -128,13 +128,14 @@
throw new FacesException(e);
}
- table.setSelection(simpleSelection);
ValueExpression selectionBinding = table
.getValueExpression("selection");
if (selectionBinding != null) {
selectionBinding.setValue(context.getELContext(),
simpleSelection);
+ }else{
+ table.setSelection(simpleSelection);
}
table.setRowKey(savedKey);
// ScrollableDataTableRendererState.restoreState(context);
16 years, 1 month
JBoss Rich Faces SVN: r10688 - in trunk/sandbox/ui/editor/src/main/java/org/richfaces: antlr and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-10-08 05:06:41 -0400 (Wed, 08 Oct 2008)
New Revision: 10688
Added:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/
trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/HtmlSeamSample.java
trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/html-seam.g
Log:
initial commit: antlr grammar sample
Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/HtmlSeamSample.java
===================================================================
--- trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/HtmlSeamSample.java (rev 0)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/HtmlSeamSample.java 2008-10-08 09:06:41 UTC (rev 10688)
@@ -0,0 +1,50 @@
+package org.richfaces.antlr;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+
+import org.jboss.seam.text.SeamTextLexer;
+import org.jboss.seam.text.SeamTextParser;
+
+import antlr.ANTLRException;
+
+/*
+ * html --> seam text sample
+ *
+ *
+ */
+
+public class HtmlSeamSample {
+
+ public static void main(String[] args) throws ANTLRException, IOException {
+ System.out.println("Enter one or several lines of text. Type \"go\" at new line when done");
+ System.out.println();
+
+ BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+
+ String line = "";
+ String bufLine;
+
+ while ((bufLine = in.readLine()) != null) {
+ if (!"go".equals(bufLine)) {
+ if (line.length() > 0) {
+ line += "\n";
+ }
+ line += bufLine;
+
+ } else {
+// SeamTextParser parser = new SeamTextParser(new SeamTextLexer(new StringReader(line)));
+ line = "";
+ try {
+// parser.startRule();
+// System.out.println(parser.toString());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/html-seam.g
===================================================================
--- trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/html-seam.g (rev 0)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/antlr/html-seam.g 2008-10-08 09:06:41 UTC (rev 10688)
@@ -0,0 +1,12 @@
+header
+{
+ package org.richfaces.antlr;
+}
+
+class HtmlSeamParser extends Parser;
+fooRule : "fooRule";
+
+
+class HtmlSeamLexer extends Lexer;
+HMTL : "html";
+
16 years, 1 month
JBoss Rich Faces SVN: r10687 - trunk/samples/extendedDataTable-sample/src/main/java/org/richfaces/samples/extdt/beans.
by richfaces-svn-commits＠lists.jboss.org
Author: pgolawski
Date: 2008-10-08 05:00:20 -0400 (Wed, 08 Oct 2008)
New Revision: 10687
Modified:
trunk/samples/extendedDataTable-sample/src/main/java/org/richfaces/samples/extdt/beans/ExtendedDataTableBB.java
Log:
Base64 encode and decode cookie
Modified: trunk/samples/extendedDataTable-sample/src/main/java/org/richfaces/samples/extdt/beans/ExtendedDataTableBB.java
===================================================================
--- trunk/samples/extendedDataTable-sample/src/main/java/org/richfaces/samples/extdt/beans/ExtendedDataTableBB.java 2008-10-08 08:55:56 UTC (rev 10686)
+++ trunk/samples/extendedDataTable-sample/src/main/java/org/richfaces/samples/extdt/beans/ExtendedDataTableBB.java 2008-10-08 09:00:20 UTC (rev 10687)
@@ -1,5 +1,6 @@
package org.richfaces.samples.extdt.beans;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
@@ -10,10 +11,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.ajax4jsf.util.base64.Base64;
+import org.richfaces.model.ExtendedTableDataModel;
+import org.richfaces.model.selection.SimpleSelection;
import org.richfaces.samples.extdt.model.impl.DemoPatient;
import org.richfaces.samples.extdt.model.impl.DemoPatientProvider;
-import org.richfaces.model.ExtendedTableDataModel;
-import org.richfaces.model.selection.SimpleSelection;
/**
* @author pkawiak
@@ -84,8 +86,12 @@
Cookie[] cookies = ((HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest()).getCookies();
if (cookies != null){
for (Cookie c : cookies){
- if (c.getName().equals("g3demoTabelState")){
- tableState = c.getValue();
+ if (c.getName().equals("extdtSampleTabelState")){
+ try {
+ tableState = new String(Base64.decodeBase64(c.getValue().getBytes("UTF-8")),"UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
break;
}
}
@@ -95,10 +101,17 @@
}
public void setTableState(String tableState) {
- this.tableState = tableState;
- //save state in cookies
- Cookie stateCookie = new Cookie("g3demoTabelState", this.tableState);
- ((HttpServletResponse)FacesContext.getCurrentInstance().getExternalContext().getResponse()).addCookie(stateCookie);
+ try {
+ this.tableState = tableState;
+ //save state in cookies
+ Cookie stateCookie = new Cookie("extdtSampleTabelState", new String(Base64.encodeBase64(this.tableState.getBytes("UTF-8")),"UTF-8"));
+ stateCookie.setMaxAge(30 * 24 * 60 * 60);
+ ((HttpServletResponse)FacesContext.getCurrentInstance().getExternalContext().getResponse()).addCookie(stateCookie);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+
+
}
public Comparator<DemoPatient> getDateComparator(){
16 years, 1 month
JBoss Rich Faces SVN: r10686 - trunk/samples/extendedDataTable-sample/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: pgolawski
Date: 2008-10-08 04:55:56 -0400 (Wed, 08 Oct 2008)
New Revision: 10686
Modified:
trunk/samples/extendedDataTable-sample/src/main/webapp/index.jsp
Log:
redirect to proper page instead of forward
Modified: trunk/samples/extendedDataTable-sample/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/extendedDataTable-sample/src/main/webapp/index.jsp 2008-10-07 16:55:04 UTC (rev 10685)
+++ trunk/samples/extendedDataTable-sample/src/main/webapp/index.jsp 2008-10-08 08:55:56 UTC (rev 10686)
@@ -3,10 +3,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Refresh" content="0; url=pages/index.jsf">
<title>Insert title here</title>
</head>
<body>
- <jsp:forward page="/pages/index.jsf"/>
</body>
</html>
\ No newline at end of file
16 years, 1 month
JBoss Rich Faces SVN: r10685 - trunk/test-applications/HelloWorld/.settings.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-07 12:55:04 -0400 (Tue, 07 Oct 2008)
New Revision: 10685
Added:
trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.component
trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.project.facet.core.xml
Modified:
trunk/test-applications/HelloWorld/.settings/org.eclipse.jdt.core.prefs
Log:
Modified: trunk/test-applications/HelloWorld/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/test-applications/HelloWorld/.settings/org.eclipse.jdt.core.prefs 2008-10-07 16:47:41 UTC (rev 10684)
+++ trunk/test-applications/HelloWorld/.settings/org.eclipse.jdt.core.prefs 2008-10-07 16:55:04 UTC (rev 10685)
@@ -1,4 +1,4 @@
-#Tue Oct 07 19:06:27 EEST 2008
+#Tue Oct 07 19:51:27 EEST 2008
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.component 2008-10-07 16:55:04 UTC (rev 10685)
@@ -0,0 +1,117 @@
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="HelloWorld">
+ <property name="context-root" value="HelloWorld"/>
+ <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+ <property name="java-output-path" value="/target/classes"/>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0-SNAPSHOT/richfaces-ui-3.3.0-SNAPSHOT.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/uwyn/jhighlight/1.0/jhighlight-1.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-ui/2.0.0.GA/jboss-seam-ui-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-ioc/2.0.0.GA/jboss-seam-ioc-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam/2.0.0.GA/jboss-seam-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/servlet/jstl/1.0/jstl-1.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dom4j/dom4j/1.6.1-jboss/dom4j-1.6.1-jboss.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.CR1/hibernate-commons-annotations-3.1.0.CR1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/lowagie/itext/2.0.4/itext-2.0.4.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-mail/2.0.0.GA/jboss-seam-mail-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-pdf/2.0.0.GA/jboss-seam-pdf-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/hibernate-validator/3.1.0.CR1/hibernate-validator-3.1.0.CR1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-impl/3.3.0-SNAPSHOT/richfaces-impl-3.3.0-SNAPSHOT.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/hibernate-core/3.3.0.CR1/hibernate-core-3.3.0.CR1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-remoting/2.0.0.GA/jboss-seam-remoting-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/faces/jsf-impl/1.2_09/jsf-impl-1.2_09.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/richfaces/framework/richfaces-api/3.3.0-SNAPSHOT/richfaces-api-3.3.0-SNAPSHOT.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-el/2.0.0.GA/jboss-el-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/seam/jboss-seam-debug/2.0.0.GA/jboss-seam-debug-2.0.0.GA.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added: trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/test-applications/HelloWorld/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-10-07 16:55:04 UTC (rev 10685)
@@ -0,0 +1,6 @@
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file
16 years, 1 month