You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by re...@apache.org on 2011/11/02 17:08:48 UTC
svn commit: r1196662 - in
/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2: ./
src/main/java/components/ src/main/java/org/apache/empire/jsf2/websample/web/
src/main/java/org/apache/empire/jsf2/websample/web/pages/ src/main/webapp/
...
Author: reiher
Date: Wed Nov 2 16:08:47 2011
New Revision: 1196662
URL: http://svn.apache.org/viewvc?rev=1196662&view=rev
Log:
EMPIREDB-119 Removed ICEfaces dependencies and replaced the Mojarra JSF2 implementation by the Apache MyFaces implementation.
Removed:
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/PageELResolver.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleExceptionHandler.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleExceptionHandlerFactory.java
Modified:
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/pom.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/components/control.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleNavigationHandler.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleSession.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeSearchPage.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/ErrorPage.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/header.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/layout.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/web.xml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/index.html
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeListPage.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeSearchPage.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/loginPage.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml
incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/pom.xml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/pom.xml Wed Nov 2 16:08:47 2011
@@ -21,6 +21,7 @@
<artifactId>empire-db-examples</artifactId>
<version>2.2.1-incubating-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-example-jsf2</artifactId>
<packaging>war</packaging>
<name>Apache Empire-db JSF2 Example</name>
@@ -45,18 +46,12 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- use log4j for logging -->
-<!-- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency> -->
-
- <!-- ICEfaces -->
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- myfaces -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
@@ -65,43 +60,17 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces</artifactId>
- <version>2.0.2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces-ace</artifactId>
- <version>2.0.2</version>
- <type>jar</type>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>2.0.4</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces-compat</artifactId>
- <version>2.0.2</version>
- <type>jar</type>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>2.0.4</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.icepush</groupId>
- <artifactId>icepush</artifactId>
- <version>2.0.2</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -118,16 +87,16 @@
</additionalProjectFacets>
</configuration>
</plugin>
- <!-- Sysdeo Tomcat Eclipse -->
+ <!-- Sysdeo Tomcat Eclipse -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sysdeo-tomcat-maven-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <webPath>empire-db-example-jsf2</webPath>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sysdeo-tomcat-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <webPath>empire-db-example-jsf2</webPath>
+ </configuration>
</plugin>
- <!-- Jetty -->
+ <!-- Jetty -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
@@ -138,15 +107,10 @@
<stopPort>9999</stopPort>
</configuration>
<executions>
- <!--
- <execution> <id>start-jetty</id>
- <phase>pre-integration-test</phase> <goals> <goal>run</goal>
- </goals> <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds> <daemon>true</daemon>
- </configuration> </execution> <execution> <id>stop-jetty</id>
- <phase>post-integration-test</phase> <goals> <goal>stop</goal>
- </goals> </execution>
- -->
+ <!-- <execution> <id>start-jetty</id> <phase>pre-integration-test</phase>
+ <goals> <goal>run</goal> </goals> <configuration> <scanIntervalSeconds>0</scanIntervalSeconds>
+ <daemon>true</daemon> </configuration> </execution> <execution> <id>stop-jetty</id>
+ <phase>post-integration-test</phase> <goals> <goal>stop</goal> </goals> </execution> -->
</executions>
</plugin>
</plugins>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/components/control.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/components/control.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/components/control.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/components/control.java Wed Nov 2 16:08:47 2011
@@ -26,6 +26,10 @@ import javax.faces.component.NamingConta
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UISelectItem;
+import javax.faces.component.html.HtmlInputText;
+import javax.faces.component.html.HtmlOutputLabel;
+import javax.faces.component.html.HtmlSelectBooleanCheckbox;
+import javax.faces.component.html.HtmlSelectOneMenu;
import javax.faces.context.FacesContext;
import javax.faces.validator.LengthValidator;
@@ -38,11 +42,6 @@ import org.apache.empire.jsf2.websample.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.icesoft.faces.component.ext.HtmlInputText;
-import com.icesoft.faces.component.ext.HtmlOutputLabel;
-import com.icesoft.faces.component.ext.HtmlSelectBooleanCheckbox;
-import com.icesoft.faces.component.ext.HtmlSelectOneMenu;
-
public class control extends UIInput implements NamingContainer {
// Logger
private static final Logger log = LoggerFactory.getLogger(control.class);
@@ -50,22 +49,41 @@ public class control extends UIInput imp
private static final String LABEL_SUFFIX = "label";
private static final String INPUT_SUFFIX = "input";
+ public control()
+ {
+ super();
+ }
+
@Override
public String getFamily() {
return "javax.faces.NamingContainer";
}
+
@Override
public void encodeBegin(FacesContext context) throws IOException {
// add label and input components when the view is loaded for the first time
- HtmlOutputLabel label = getLabelComponent() == null ? createOutputLabelForCol()
- : getLabelComponent();
- UIInput inputComponent = getInputComponent() == null ? createInputComponentForCol()
- : getInputComponent();
+ HtmlOutputLabel labelComponent = null;
+ UIInput inputComponent = null;
+ if (getChildCount() > 0)
+ {
+ labelComponent = (HtmlOutputLabel)getChildren().get(0);
+ inputComponent = (UIInput)getChildren().get(1);
+ }
+ if (labelComponent == null)
+ {
+ labelComponent = createOutputLabelForCol();
+ this.getChildren().add(labelComponent);
+ }
+ if (inputComponent == null)
+ {
+ inputComponent = createInputComponentForCol();
+ this.getChildren().add(inputComponent);
+ }
// render components
context.getResponseWriter().startElement("div", null);
- label.encodeAll(context);
+ labelComponent.encodeAll(context);
inputComponent.encodeAll(context);
context.getResponseWriter().endElement("div");
@@ -79,7 +97,7 @@ public class control extends UIInput imp
// don't set automatically created cols or readOnly cols
if (!col.isAutoGenerated() && !isReadOnly()) {
- UIInput inputComponent = getInputComponent();
+ UIInput inputComponent = (UIInput)getChildren().get(1);
rec.setValue(col, inputComponent.getValue());
}
super.updateModel(context);
@@ -88,8 +106,9 @@ public class control extends UIInput imp
@Override
public void validate(FacesContext context) {
// nothing submitted (AJAX part request, e.g. calendar component) or readonly (won't be set in updateModel())?
- UIInput inputComponent = getInputComponent();
- if (isReadOnly() || inputComponent == null || inputComponent.getSubmittedValue() == null)
+ UIInput inputComponent = (UIInput)getChildren().get(1);
+ // component itself already checked validity, was it successful?
+ if (inputComponent == null || !inputComponent.isValid() || isReadOnly())
{
return;
}
@@ -98,7 +117,6 @@ public class control extends UIInput imp
DBTableColumn col = (DBTableColumn) rec.getDBColumn(rec
.getFieldIndex(getAttributes().get("column").toString()));
try {
- inputComponent.validate(context);
col.checkValue(inputComponent.getValue());
} catch (Exception e) {
FacesContext.getCurrentInstance().addMessage(getClientId(), new FacesMessage(e.getLocalizedMessage()));
@@ -114,7 +132,7 @@ public class control extends UIInput imp
while (optionsIterator.hasNext()) {
OptionEntry optionEntry = optionsIterator.next();
UISelectItem selectItem = new UISelectItem();
- selectItem.setItemValue(optionEntry.getValue());
+ selectItem.setItemValue(optionEntry.getValueString());
selectItem.setItemLabel(FacesUtils.getMessageForKey(optionEntry
.getText()));
component.getChildren().add(selectItem);
@@ -230,7 +248,6 @@ public class control extends UIInput imp
input.setRequired(col.isRequired() && !col.isAutoGenerated());
input.setId(this.getId() + INPUT_SUFFIX);
input.setValue(getRecord().getValue(col));
- this.getChildren().add(input);
return input;
}
@@ -243,7 +260,6 @@ public class control extends UIInput imp
}
label.setId(this.getId() + LABEL_SUFFIX);
label.setValue(colName);
- this.getChildren().add(label);
return label;
}
@@ -286,14 +302,6 @@ public class control extends UIInput imp
return getColumn().isReadOnly();
}
- private HtmlOutputLabel getLabelComponent() {
- return (HtmlOutputLabel) findComponent(this.getId() + LABEL_SUFFIX);
- }
-
- private UIInput getInputComponent() {
- return (UIInput) findComponent(this.getId() + INPUT_SUFFIX);
- }
-
private String getLabelString() {
String label = null;
// check attributes if default col label is overriden
@@ -306,5 +314,4 @@ public class control extends UIInput imp
}
return FacesUtils.getMessageForKey(label);
}
-
}
\ No newline at end of file
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleNavigationHandler.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleNavigationHandler.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleNavigationHandler.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleNavigationHandler.java Wed Nov 2 16:08:47 2011
@@ -21,8 +21,7 @@ package org.apache.empire.jsf2.websample
import javax.faces.context.FacesContext;
import org.apache.empire.commons.StringUtils;
-
-import com.sun.faces.application.NavigationHandlerImpl;
+import org.apache.myfaces.application.NavigationHandlerImpl;
public class SampleNavigationHandler extends NavigationHandlerImpl {
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleSession.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleSession.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleSession.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleSession.java Wed Nov 2 16:08:47 2011
@@ -18,8 +18,6 @@
*/
package org.apache.empire.jsf2.websample.web;
-import java.io.Serializable;
-
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
@@ -28,13 +26,8 @@ import org.slf4j.LoggerFactory;
@ManagedBean
@SessionScoped
-public class SampleSession implements Serializable
+public class SampleSession
{
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 72284452358425878L;
-
private static final Logger log = LoggerFactory.getLogger(SampleSession.class);
private SampleUser user;
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeDetailPage.java Wed Nov 2 16:08:47 2011
@@ -18,8 +18,6 @@
*/
package org.apache.empire.jsf2.websample.web.pages;
-import java.io.Serializable;
-
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
@@ -31,7 +29,7 @@ import org.slf4j.LoggerFactory;
@ManagedBean
@ViewScoped
-public class EmployeeDetailPage extends Page implements Serializable {
+public class EmployeeDetailPage extends Page {
// Logger
private static final Logger log = LoggerFactory
.getLogger(EmployeeDetailPage.class);
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeListPage.java Wed Nov 2 16:08:47 2011
@@ -18,7 +18,6 @@
*/
package org.apache.empire.jsf2.websample.web.pages;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -35,9 +34,7 @@ import org.apache.empire.jsf2.websample.
@ManagedBean
@ViewScoped
-public class EmployeeListPage extends Page implements Serializable {
- private static final long serialVersionUID = 1944555691727940966L;
-
+public class EmployeeListPage extends Page {
private List<EmployeeListItem> employeeList;
public List<EmployeeListItem> getEmployeeList() {
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeSearchPage.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeSearchPage.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeSearchPage.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/EmployeeSearchPage.java Wed Nov 2 16:08:47 2011
@@ -18,14 +18,12 @@
*/
package org.apache.empire.jsf2.websample.web.pages;
-import java.io.Serializable;
-
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
@ManagedBean
@ViewScoped
-public class EmployeeSearchPage extends Page implements Serializable
+public class EmployeeSearchPage extends Page
{
public String search()
{
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/ErrorPage.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/ErrorPage.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/ErrorPage.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/ErrorPage.java Wed Nov 2 16:08:47 2011
@@ -18,7 +18,6 @@
*/
package org.apache.empire.jsf2.websample.web.pages;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +26,7 @@ import javax.faces.bean.ViewScoped;
@ManagedBean(name = "error")
@ViewScoped
-public class ErrorPage extends Page implements Serializable
+public class ErrorPage extends Page
{
private boolean showDetails = false;
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java Wed Nov 2 16:08:47 2011
@@ -18,8 +18,6 @@
*/
package org.apache.empire.jsf2.websample.web.pages;
-import java.io.Serializable;
-
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
@@ -29,7 +27,7 @@ import org.apache.empire.jsf2.websample.
@ManagedBean
@ViewScoped
-public class LoginPage extends Page implements Serializable
+public class LoginPage extends Page
{
public String logout()
{
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/header.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/header.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/header.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/header.xhtml Wed Nov 2 16:08:47 2011
@@ -16,20 +16,20 @@
specific language governing permissions and limitations
under the License.
-->
-<ice:panelGroup id="header" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
+<h:panelGroup id="header" xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<!-- title & logo line -->
- <ice:panelGroup id="titleLogoLine">
+ <h:panelGroup id="titleLogoLine">
<!-- title box -->
- <ice:panelGroup id="titleBox">
+ <h:panelGroup id="titleBox">
<h1>
- <ice:outputText value="#{msg.application_title} - #{pageTitle}" />
+ <h:outputText value="#{msg.application_title} - #{pageTitle}" />
</h1>
- </ice:panelGroup>
+ </h:panelGroup>
- </ice:panelGroup>
+ </h:panelGroup>
-</ice:panelGroup>
\ No newline at end of file
+</h:panelGroup>
\ No newline at end of file
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/layout.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/layout.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/layout.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/facelets/templates/layout.xhtml Wed Nov 2 16:08:47 2011
@@ -17,20 +17,17 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
+ -->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ice="http://www.icesoft.com/icefaces/component">
-
-<!-- internationalization -->
-<ice:loadBundle basename="lang.messages" var="msg" />
+ xmlns:f="http://java.sun.com/jsf/core">
<!-- Prerender event used to init page, e.g. for loading data from db -->
-<f:metadata>
- <f:event type="preRenderView" listener="#{page.preRenderViewAction}"/>
-</f:metadata>
+<f:event type="preRenderView" listener="#{page.preRenderViewAction}" />
+
+<!-- internationalization -->
+<f:loadBundle basename="lang.messages" var="msg" />
<h:head>
@@ -45,8 +42,9 @@
<meta name="description" content="" />
<!-- global stylesheets -->
- <link rel="stylesheet" type="text/css" href="../xmlhttp/css/rime/rime.css"/>
-<!--
+ <link rel="stylesheet" type="text/css"
+ href="../xmlhttp/css/rime/rime.css" />
+ <!--
<link href="../css/sample.css" rel="stylesheet" media="all"
type="text/css" />
-->
@@ -65,17 +63,17 @@
<ui:include src="header.xhtml" />
<!-- (error) messages -->
- <ice:messages />
-
+ <h:messages />
+
<!-- content -->
- <ice:panelGroup id="content" styleClass="#{contentStyle}">
+ <h:panelGroup id="content" styleClass="#{contentStyle}">
<ui:insert name="content" />
- </ice:panelGroup>
+ </h:panelGroup>
<!-- content footer -->
- <ice:panelGroup id="contentFooter" rendered="#{contentFooter}">
+ <h:panelGroup id="contentFooter" rendered="#{contentFooter}">
<ui:insert name="contentFooter" />
- </ice:panelGroup>
+ </h:panelGroup>
</h:body>
</html>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml Wed Nov 2 16:08:47 2011
@@ -29,7 +29,6 @@
</locale-config>
<message-bundle>lang.messages</message-bundle>
<navigation-handler>org.apache.empire.jsf2.websample.web.SampleNavigationHandler</navigation-handler>
- <el-resolver>org.apache.empire.jsf2.websample.web.PageELResolver</el-resolver>
</application>
<lifecycle>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/web.xml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/web.xml Wed Nov 2 16:08:47 2011
@@ -1,31 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
id="JSF2Sample" version="2.5">
- <display-name>Empire DBWebSample</display-name>
+ <display-name>Empire DBWebSample</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
@@ -33,20 +25,9 @@
</servlet>
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.iface</url-pattern>
<url-pattern>*.xhtml</url-pattern>
- <url-pattern>*.jsf</url-pattern>
- <url-pattern>/icefaces/*</url-pattern>
+ <url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <servlet>
- <servlet-name>Resource Servlet</servlet-name>
- <servlet-class>com.icesoft.faces.webapp.CompatResourceServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Resource Servlet</servlet-name>
- <url-pattern>/xmlhttp/*</url-pattern>
- </servlet-mapping>
<filter>
<filter-name>Sample Request Filter</filter-name>
<filter-class>org.apache.empire.jsf2.websample.web.SampleRequestFilter</filter-class>
@@ -63,5 +44,9 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
+ <param-value>false</param-value>
+ </context-param>
</web-app>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/index.html?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/index.html (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/index.html Wed Nov 2 16:08:47 2011
@@ -21,7 +21,7 @@
<head>
<title>Redirecting</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<META HTTP-EQUIV="Refresh" CONTENT="0; URL=pages/loginPage.iface">
+<META HTTP-EQUIV="Refresh" CONTENT="0; URL=pages/loginPage.jsf">
</head>
<body>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml Wed Nov 2 16:08:47 2011
@@ -21,20 +21,20 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:e="http://java.sun.com/jsf/composite/components"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
- xmlns:ace="http://www.icefaces.org/icefaces/components"
xmlns:h="http://java.sun.com/jsf/html">
- <!-- parameter for page title-->
+ <!-- parameters used in layout.xhtml -->
+ <ui:param name="page" value="#{employeeDetailPage}" />
<ui:param name="pageTitle" value="#{msg.employeeDetail_title}" />
<ui:param name="contentFooter" value="true" />
<ui:param name="contentStyle" value="unstyled" />
<!-- content -->
<ui:define name="content">
- <ice:form id="employeeDetail">
- <ice:panelGrid id="panel" columns="1" border="0">
- <e:record value="#{page.employeeRecord}">
+ <h:form id="employeeDetail">
+ <h:panelGrid id="panel" columns="1" border="0">
+
+ <e:record value="#{employeeDetailPage.employeeRecord}">
<e:control column="EMPLOYEE_ID" />
<e:control column="SALUTATION" />
<e:control column="FIRST_NAME" />
@@ -46,16 +46,17 @@
<e:control column="EMAIL" />
<e:control column="RETIRED" />
<e:control column="UPDATE_TIMESTAMP" readonly="true" />
- </e:record>
- <ice:panelGroup>
- <ice:commandButton value="#{msg.employeeDetail_save}"
- action="#{page.save}" />
- <ice:commandButton value="#{msg.employeeDetail_cancel}"
- immediate="true" action="#{page.cancel}" />
- <ice:commandButton value="#{msg.employeeDetail_delete}"
- immediate="true" action="#{page.delete}" />
- </ice:panelGroup>
- </ice:panelGrid>
- </ice:form>
+ </e:record>
+
+ <h:panelGroup>
+ <h:commandButton value="#{msg.employeeDetail_save}"
+ action="#{employeeDetailPage.save}" />
+ <h:commandButton value="#{msg.employeeDetail_cancel}"
+ immediate="true" action="#{employeeDetailPage.cancel}" />
+ <h:commandButton value="#{msg.employeeDetail_delete}"
+ immediate="true" action="#{employeeDetailPage.delete}" />
+ </h:panelGroup>
+ </h:panelGrid>
+ </h:form>
</ui:define>
</ui:composition>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeListPage.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeListPage.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeListPage.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeListPage.xhtml Wed Nov 2 16:08:47 2011
@@ -20,11 +20,10 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
- xmlns:ace="http://www.icefaces.org/icefaces/components"
xmlns:h="http://java.sun.com/jsf/html">
- <!-- parameter for page title-->
+ <!-- parameters used in layout.xhtml -->
+ <ui:param name="page" value="#{employeeListPage}" />
<ui:param name="pageTitle" value="#{msg.employeeList_title}" />
<ui:param name="contentFooter" value="true" />
<ui:param name="contentStyle" value="unstyled" />
@@ -32,16 +31,16 @@
<!-- content -->
<ui:define name="content">
<h:link outcome="employeeDetailPage" value="#{msg.employeeList_create}" />
- <ice:dataTable value="#{page.employeeList}" var="item">
+ <h:dataTable value="#{employeeListPage.employeeList}" var="item">
<h:column>
<f:facet name="header">
- <ice:outputText value="#{msg.employeeList_field_employeeId}" />
+ <h:outputText value="#{msg.employeeList_field_employeeId}" />
</f:facet>
- <ice:outputText value="#{item.employeeId}" />
+ <h:outputText value="#{item.employeeId}" />
</h:column>
<h:column>
<f:facet name="header">
- <ice:outputText value="#{msg.employeeList_field_name}" />
+ <h:outputText value="#{msg.employeeList_field_name}" />
</f:facet>
<h:link outcome="employeeDetailPage" value="#{item.name}">
<f:param name="id" value="#{item.employeeId}" />
@@ -49,23 +48,23 @@
</h:column>
<h:column>
<f:facet name="header">
- <ice:outputText value="#{msg.employeeList_field_gender}" />
+ <h:outputText value="#{msg.employeeList_field_gender}" />
</f:facet>
- <ice:outputText value="#{item.gender}" />
+ <h:outputText value="#{item.gender}" />
</h:column>
<h:column>
<f:facet name="header">
- <ice:outputText value="#{msg.employeeList_field_dateOfBirth}" />
+ <h:outputText value="#{msg.employeeList_field_dateOfBirth}" />
</f:facet>
- <ice:outputText value="#{item.dateOfBirth}" />
+ <h:outputText value="#{item.dateOfBirth}" />
</h:column>
<h:column>
<f:facet name="header">
- <ice:outputText value="#{msg.employeeList_field_department}" />
+ <h:outputText value="#{msg.employeeList_field_department}" />
</f:facet>
- <ice:outputText value="#{item.department}" />
+ <h:outputText value="#{item.department}" />
</h:column>
- </ice:dataTable>
+ </h:dataTable>
<h:link outcome="employeeSearchPage" value="#{msg.employeeList_search}" />
</ui:define>
</ui:composition>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeSearchPage.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeSearchPage.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeSearchPage.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeSearchPage.xhtml Wed Nov 2 16:08:47 2011
@@ -21,34 +21,33 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
- xmlns:ace="http://www.icefaces.org/icefaces/components"
xmlns:h="http://java.sun.com/jsf/html">
- <!-- parameter for page title-->
+ <!-- parameters used in layout.xhtml -->
+ <ui:param name="page" value="#{employeeSearchPage}" />
<ui:param name="pageTitle" value="#{msg.employeeSearch_title}" />
<ui:param name="contentFooter" value="true" />
<ui:param name="contentStyle" value="unstyled" />
<!-- content -->
<ui:define name="content">
- <ice:form id="login">
- <ice:panelGrid id="panel" columns="2" border="0">
- <ice:outputLabel for="employeeId" value="#{msg.employeeSearch_field_employeeId}" />
- <ice:inputText id="employeeId" value="#{employeeSearch.employeeId}" />
+ <h:form id="login">
+ <h:panelGrid id="panel" columns="2" border="0">
+ <h:outputLabel for="employeeId" value="#{msg.employeeSearch_field_employeeId}" />
+ <h:inputText id="employeeId" value="#{employeeSearch.employeeId}" />
- <ice:outputLabel for="firstName" value="#{msg.employeeSearch_field_firstName}" />
- <ice:inputText id="firstName" value="#{employeeSearch.firstName}" />
+ <h:outputLabel for="firstName" value="#{msg.employeeSearch_field_firstName}" />
+ <h:inputText id="firstName" value="#{employeeSearch.firstName}" />
- <ice:outputLabel for="lastName" value="#{msg.employeeSearch_field_lastName}" />
- <ice:inputText id="lastName" value="#{employeeSearch.lastName}" />
+ <h:outputLabel for="lastName" value="#{msg.employeeSearch_field_lastName}" />
+ <h:inputText id="lastName" value="#{employeeSearch.lastName}" />
- <ice:outputLabel for="departmentId" value="#{msg.employeeSearch_field_departmentId}" />
- <ice:inputText id="departmentId" value="#{employeeSearch.departmentId}" />
+ <h:outputLabel for="departmentId" value="#{msg.employeeSearch_field_departmentId}" />
+ <h:inputText id="departmentId" value="#{employeeSearch.departmentId}" />
- <ice:commandButton colspan="2" value="#{msg.employeeSearch_search}" action="#{page.search}" />
- <ice:commandLink action="#{loginPage.logout}" value="#{msg.application_logout}" />
- </ice:panelGrid>
- </ice:form>
+ <h:commandButton colspan="2" value="#{msg.employeeSearch_search}" action="#{employeeSearchPage.search}" />
+ <h:commandLink action="#{loginPage.logout}" value="#{msg.application_logout}" />
+ </h:panelGrid>
+ </h:form>
</ui:define>
</ui:composition>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/loginPage.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/loginPage.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/loginPage.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/loginPage.xhtml Wed Nov 2 16:08:47 2011
@@ -21,25 +21,24 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
- xmlns:ace="http://www.icefaces.org/icefaces/components"
xmlns:h="http://java.sun.com/jsf/html">
- <!-- parameter for page title-->
+ <!-- parameters used in layout.xhtml -->
+ <ui:param name="page" value="#{loginPage}" />
<ui:param name="pageTitle" value="#{msg.login_title}" />
<ui:param name="contentFooter" value="true" />
<ui:param name="contentStyle" value="unstyled" />
<!-- content -->
<ui:define name="content">
- <ice:form id="login">
- <ice:panelGrid id="panel" columns="2" border="0">
- <ice:outputLabel for="name" value="#{msg.login_field_name}" />
- <ice:inputText id="name" value="#{user.name}" />
- <ice:outputLabel for="name" value="#{msg.login_field_password}" />
- <ice:inputSecret id="password" value="#{user.password}" />
- <ice:commandButton value="#{msg.login_login}" action="#{page.login}" />
- </ice:panelGrid>
- </ice:form>
+ <h:form id="login">
+ <h:panelGrid id="panel" columns="2" border="0">
+ <h:outputLabel for="name" value="#{msg.login_field_name}" />
+ <h:inputText id="name" value="#{user.name}" />
+ <h:outputLabel for="name" value="#{msg.login_field_password}" />
+ <h:inputSecret id="password" value="#{user.password}" />
+ <h:commandButton value="#{msg.login_login}" action="#{loginPage.login}" />
+ </h:panelGrid>
+ </h:form>
</ui:define>
</ui:composition>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/control.xhtml Wed Nov 2 16:08:47 2011
@@ -21,7 +21,6 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:composite="http://java.sun.com/jsf/composite">
<composite:interface>
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml?rev=1196662&r1=1196661&r2=1196662&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/resources/components/record.xhtml Wed Nov 2 16:08:47 2011
@@ -21,7 +21,6 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:composite="http://java.sun.com/jsf/composite">
<composite:interface>