Added optional EAR packaging
diff --git a/employee/employee.ear/.project b/employee/employee.ear/.project
new file mode 100644
index 0000000..f919080
--- /dev/null
+++ b/employee/employee.ear/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Employee Example - EAR</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/employee/employee.ear/.settings/org.eclipse.m2e.core.prefs b/employee/employee.ear/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/employee/employee.ear/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/employee/employee.ear/pom.xml b/employee/employee.ear/pom.xml
new file mode 100644
index 0000000..814b1a7
--- /dev/null
+++ b/employee/employee.ear/pom.xml
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <relativePath>..</relativePath>
+ <groupId>eclipselink.example.jpa</groupId>
+ <artifactId>employee</artifactId>
+ <version>2.4.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>employee.ear</artifactId>
+ <packaging>ear</packaging>
+
+ <name>employee.ear</name>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <modules>
+ <webModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>employee.web</artifactId>
+ <contextRoot>/employee</contextRoot>
+ </webModule>
+ <jarModule>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>employee.model</artifactId>
+ </jarModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>eclipselink.example.jpa</groupId>
+ <artifactId>employee.web</artifactId>
+ <version>2.4.2-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>eclipselink.example.jpa</groupId>
+ <artifactId>employee.model</artifactId>
+ <version>2.4.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/employee/employee.ear/src/main/application/META-INF/MANIFEST.MF b/employee/employee.ear/src/main/application/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..59499bc
--- /dev/null
+++ b/employee/employee.ear/src/main/application/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/employee/employee.model/.classpath b/employee/employee.model/.classpath
index 6b9ef37..22d27eb 100644
--- a/employee/employee.model/.classpath
+++ b/employee/employee.model/.classpath
@@ -6,7 +6,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
diff --git a/employee/employee.model/src/main/resources/META-INF/persistence.xml b/employee/employee.model/src/main/resources/META-INF/persistence.xml
index 224a2fe..d979684 100644
--- a/employee/employee.model/src/main/resources/META-INF/persistence.xml
+++ b/employee/employee.model/src/main/resources/META-INF/persistence.xml
@@ -17,6 +17,7 @@
<property name="eclipselink.logging.exceptions" value="false"/>
<property name="eclipselink.logging.connection" value="false"/>
<property name="eclipselink.logging.level.metadata" value="WARNING"/>
+ <property name="eclipselink.logging.logger" value="DefaultLogger"/>
</properties>
</persistence-unit>
</persistence>
diff --git a/employee/employee.web/.classpath b/employee/employee.web/.classpath
index 9a90621..abcfd21 100644
--- a/employee/employee.web/.classpath
+++ b/employee/employee.web/.classpath
@@ -17,17 +17,17 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/employee/employee.web/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow b/employee/employee.web/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
new file mode 100644
index 0000000..5050e24
--- /dev/null
+++ b/employee/employee.web/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pageflow:Pageflow xmlns:pageflow="http://www.sybase.com/suade/pageflow" id="pf13591307684010" configfile="/Employee Example - web/src/main/webapp/WEB-INF/faces-config.xml"/>
diff --git a/employee/employee.web/.project b/employee/employee.web/.project
index b060668..03af44d 100644
--- a/employee/employee.web/.project
+++ b/employee/employee.web/.project
@@ -22,12 +22,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
diff --git a/employee/employee.web/.settings/org.eclipse.jdt.core.prefs b/employee/employee.web/.settings/org.eclipse.jdt.core.prefs
index 443e085..107056a 100644
--- a/employee/employee.web/.settings/org.eclipse.jdt.core.prefs
+++ b/employee/employee.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/employee/employee.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/employee/employee.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index ef421ec..1f55f72 100644
--- a/employee/employee.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/employee/employee.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="java" version="1.7"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
+ <installed facet="java" version="1.6"/>
</faceted-project>
diff --git a/employee/employee.web/pom.xml b/employee/employee.web/pom.xml
index 7a775ed..9ce1f0c 100644
--- a/employee/employee.web/pom.xml
+++ b/employee/employee.web/pom.xml
@@ -53,6 +53,7 @@
<artifactId>employee.model</artifactId>
<version>2.4.2-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
diff --git a/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee
new file mode 100644
index 0000000..4736466
--- /dev/null
+++ b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
+ ******************************************************************************/
+package eclipselink.example.jpa.employee.web;
+
+import java.util.List;
+
+import javax.faces.bean.ManagedBean;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
+
+import model.Employee;
+
+/**
+ * Return list of available Leagues from JAX-RS call to MySports Admin app.
+ *
+ * @author dclarke
+ * @since EclipseLink 2.3.0
+ */
+@ManagedBean
+public class EmployeeList {
+
+ private EntityManagerFactory emf;
+
+ protected static final String PAGE = "index";
+
+ public EntityManagerFactory getEmf() {
+ return emf;
+ }
+
+ @PersistenceUnit(unitName="employee")
+ public void setEmf(EntityManagerFactory emf) {
+ this.emf = emf;
+ }
+
+ public List<Employee> getEmployees() {
+ EntityManager em = getEmf().createEntityManager();
+ try {
+ return em.createQuery("SELECT e FROM Employee e ORDER BY e.id", Employee.class).getResultList();
+ } finally {
+ em.close();
+ }
+ }
+}
diff --git a/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee.java b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee.java
new file mode 100644
index 0000000..59fc476
--- /dev/null
+++ b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/CreateEmployee.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
+ * which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * dclarke - EclipseLink 2.3 - MySports Demo Bug 344608
+ ******************************************************************************/
+package eclipselink.example.jpa.employee.web;
+
+import java.util.List;
+
+import javax.faces.bean.ManagedBean;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
+
+import model.Employee;
+import model.Gender;
+
+/**
+ * Return list of available Leagues from JAX-RS call to MySports Admin app.
+ *
+ * @author dclarke
+ * @since EclipseLink 2.3.0
+ */
+@ManagedBean
+public class CreateEmployee {
+
+ private String firstName;
+
+ private String lastName;
+
+ private String gender;
+
+ private EntityManagerFactory emf;
+
+ protected static final String PAGE = "employee-create";
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ public EntityManagerFactory getEmf() {
+ return emf;
+ }
+
+ @PersistenceUnit(unitName="employee")
+ public void setEmf(EntityManagerFactory emf) {
+ this.emf = emf;
+ }
+
+ public String create() {
+ Employee emp = new Employee();
+ emp.setFirstName(getFirstName());
+ emp.setLastName(getLastName());
+ emp.setGender(Gender.valueOf(getGender()));
+
+ EntityManager em = getEmf().createEntityManager();
+ try {
+ em.getTransaction().begin();
+ em.persist(emp);
+ em.getTransaction().commit();
+ } finally {
+ em.close();
+ }
+
+
+ System.out.println("CERATE: " + emp);
+ return EmployeeList.PAGE;
+ }
+}
diff --git a/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/EmployeeList.java b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/EmployeeList.java
index 32e6ec5..4736466 100644
--- a/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/EmployeeList.java
+++ b/employee/employee.web/src/main/java/eclipselink/example/jpa/employee/web/EmployeeList.java
@@ -46,7 +46,7 @@
public List<Employee> getEmployees() {
EntityManager em = getEmf().createEntityManager();
try {
- return em.createQuery("SELECT e FROM Employee e ORDER BY e.lastName, e.firstName", Employee.class).getResultList();
+ return em.createQuery("SELECT e FROM Employee e ORDER BY e.id", Employee.class).getResultList();
} finally {
em.close();
}
diff --git a/employee/employee.web/src/main/webapp/WEB-INF/web.xml b/employee/employee.web/src/main/webapp/WEB-INF/web.xml
index 1b9856a..07226da 100644
--- a/employee/employee.web/src/main/webapp/WEB-INF/web.xml
+++ b/employee/employee.web/src/main/webapp/WEB-INF/web.xml
@@ -8,8 +8,7 @@
<display-name>EclipseLink Employee Example</display-name>
<welcome-file-list>
- <welcome-file>faces/index.html</welcome-file>
- <welcome-file>index.xhtml</welcome-file>
+ <welcome-file>/faces/index.xhtml</welcome-file>
</welcome-file-list>
<servlet>
diff --git a/employee/employee.web/src/main/webapp/employee-create.xhtml b/employee/employee.web/src/main/webapp/employee-create.xhtml
new file mode 100644
index 0000000..b821db1
--- /dev/null
+++ b/employee/employee.web/src/main/webapp/employee-create.xhtml
@@ -0,0 +1,37 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+
+<ui:composition template="template.jsf">
+ <ui:define name="title">Create Employee</ui:define>
+ <ui:define name="body">
+ <h:form>
+ <div align="center">
+ <h2>Create New Employee</h2>
+ <h:panelGrid width="400" columns="2" border="1" styleClass="pretty">
+ <h:outputLabel value="First Name:" />
+ <h:inputText value="#{createEmployee.firstName}" />
+ <h:outputLabel value="Last Name:" />
+ <h:inputText value="#{createEmployee.lastName}" />
+ <h:outputLabel value="Gender:" />
+ <h:selectOneMenu value="#{createEmployee.gender}">
+ <f:selectItem id="male" itemLabel="Male" itemValue="Male" />
+ <f:selectItem id="female" itemLabel="Female" itemValue="Female" />
+ </h:selectOneMenu>
+ <f:facet name="footer">
+ <div align="center">
+ <h:commandButton value="Create" action="#{createEmployee.create}" />
+ <h:commandButton value="Cancel" action="#{createDivision.cancel}" />
+ </div>
+ </f:facet>
+ </h:panelGrid>
+ </div>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
diff --git a/employee/employee.web/src/main/webapp/employee-edit.xhtml b/employee/employee.web/src/main/webapp/employee-edit.xhtml
new file mode 100644
index 0000000..4d34d3d
--- /dev/null
+++ b/employee/employee.web/src/main/webapp/employee-edit.xhtml
@@ -0,0 +1,38 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+
+<ui:composition template="template.jsf">
+ <ui:define name="title">EclipseLink Employee Example</ui:define>
+ <ui:define name="body">
+ <h2>Employees</h2>
+ <h:form>
+ <div align="center">
+ <h:dataTable var="emp" value="#{employeeList.employees}" border="1"
+ styleClass="pretty" width="500">
+ <f:facet name="header">Employees</f:facet>
+ <h:column>
+ <f:facet name="header">ID</f:facet>
+ <h:outputText value="#{emp.id}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">Last Name</f:facet>
+ <h:outputText value="#{emp.lastName}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">First Name</f:facet>
+ <h:outputText value="#{emp.firstName}" />
+ </h:column>
+ </h:dataTable>
+
+ </div>
+ <p> </p>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
diff --git a/employee/employee.web/src/main/webapp/employees.xhtml b/employee/employee.web/src/main/webapp/employees.xhtml
new file mode 100644
index 0000000..4d34d3d
--- /dev/null
+++ b/employee/employee.web/src/main/webapp/employees.xhtml
@@ -0,0 +1,38 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+
+<ui:composition template="template.jsf">
+ <ui:define name="title">EclipseLink Employee Example</ui:define>
+ <ui:define name="body">
+ <h2>Employees</h2>
+ <h:form>
+ <div align="center">
+ <h:dataTable var="emp" value="#{employeeList.employees}" border="1"
+ styleClass="pretty" width="500">
+ <f:facet name="header">Employees</f:facet>
+ <h:column>
+ <f:facet name="header">ID</f:facet>
+ <h:outputText value="#{emp.id}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">Last Name</f:facet>
+ <h:outputText value="#{emp.lastName}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">First Name</f:facet>
+ <h:outputText value="#{emp.firstName}" />
+ </h:column>
+ </h:dataTable>
+
+ </div>
+ <p> </p>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
diff --git a/employee/employee.web/src/main/webapp/images/eclipselink-logo.png b/employee/employee.web/src/main/webapp/images/eclipselink-logo.png
new file mode 100644
index 0000000..33ed91e
--- /dev/null
+++ b/employee/employee.web/src/main/webapp/images/eclipselink-logo.png
Binary files differ
diff --git a/employee/employee.web/src/main/webapp/index.html b/employee/employee.web/src/main/webapp/index.html
deleted file mode 100644
index d8c20ad..0000000
--- a/employee/employee.web/src/main/webapp/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!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=US-ASCII">
-<title>EclipseLink Employee Example</title>
-</head>
-<body>
-<h1>EclipseLink Employee Example</h1>
-<p>Getting started</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/employee/employee.web/src/main/webapp/index.xhtml b/employee/employee.web/src/main/webapp/index.xhtml
index 4d34d3d..6e8d808 100644
--- a/employee/employee.web/src/main/webapp/index.xhtml
+++ b/employee/employee.web/src/main/webapp/index.xhtml
@@ -10,12 +10,11 @@
<ui:composition template="template.jsf">
<ui:define name="title">EclipseLink Employee Example</ui:define>
<ui:define name="body">
- <h2>Employees</h2>
<h:form>
<div align="center">
<h:dataTable var="emp" value="#{employeeList.employees}" border="1"
styleClass="pretty" width="500">
- <f:facet name="header">Employees</f:facet>
+ <f:facet name="header">All Employees</f:facet>
<h:column>
<f:facet name="header">ID</f:facet>
<h:outputText value="#{emp.id}" />
@@ -28,6 +27,10 @@
<f:facet name="header">First Name</f:facet>
<h:outputText value="#{emp.firstName}" />
</h:column>
+ <h:column>
+ <f:facet name="header">Gender</f:facet>
+ <h:outputText value="#{emp.gender}" />
+ </h:column>
</h:dataTable>
</div>
diff --git a/employee/employee.web/src/main/webapp/template.jsf b/employee/employee.web/src/main/webapp/template.jsf
index d082b79..cf6e9d1 100644
--- a/employee/employee.web/src/main/webapp/template.jsf
+++ b/employee/employee.web/src/main/webapp/template.jsf
@@ -18,11 +18,9 @@
<td width="100%">
<table width="100%">
<tr>
- <td width="100%" valign="bottom">
- <h1>
- <img src="images/employee.png" alt="Employee Demo" />
- </h1>
- </td>
+ <td width="100%" valign="middle"><img
+ src="images/eclipselink-logo.png" alt="EclipseLink" height="80" />
+ <h1>Employee Example</h1></td>
<td width="50" align="center"></td>
</tr>
@@ -48,11 +46,6 @@
<td height="10"></td>
</tr>
</table>
- <p />
- <div align="center">
- <a href="http://www.eclipse.org/eclipselink"><h:graphicImage
- url="/images/eclipselink.png" alt="EclipseLink" /> </a>
- </div>
</f:view>
</body>
</html>
diff --git a/employee/pom.xml b/employee/pom.xml
index fc21deb..5b83292 100644
--- a/employee/pom.xml
+++ b/employee/pom.xml
@@ -52,11 +52,23 @@
</repositories>
<modules>
- <module>employee.model</module>
- <module>employee.web</module>
+ <module>employee.model</module>
+ <module>employee.web</module>
</modules>
<build>
<defaultGoal>install</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
