You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/04/10 16:49:34 UTC
svn commit: r1090810 [5/7] - in /openejb/trunk/openejb3/examples:
access-timeout/ access-timeout/src/main/java/org/superbiz/accesstimeout/
access-timeout/src/test/java/org/superbiz/accesstimeout/
alternate-descriptors/ alternate-descriptors/src/main/ja...
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MovieController.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MovieController.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MovieController.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MovieController.java Sun Apr 10 14:49:26 2011
@@ -16,12 +16,9 @@
*/
package org.superbiz.moviefun;
-import org.superbiz.moviefun.Movie;
import org.superbiz.moviefun.util.JsfUtil;
import org.superbiz.moviefun.util.PaginationHelper;
-import java.io.Serializable;
-import java.util.ResourceBundle;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
@@ -32,15 +29,18 @@ import javax.faces.convert.FacesConverte
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.model.SelectItem;
+import java.io.Serializable;
+import java.util.ResourceBundle;
-@ManagedBean (name="movieController")
+@ManagedBean(name = "movieController")
@SessionScoped
public class MovieController implements Serializable {
private Movie current;
private DataModel items = null;
- @EJB private MoviesImpl ejbFacade;
+ @EJB
+ private MoviesImpl ejbFacade;
private PaginationHelper pagination;
private int selectedItemIndex;
@@ -58,6 +58,7 @@ public class MovieController implements
private MoviesImpl getFacade() {
return ejbFacade;
}
+
public PaginationHelper getPagination() {
if (pagination == null) {
pagination = new PaginationHelper(10) {
@@ -69,7 +70,7 @@ public class MovieController implements
@Override
public DataModel createPageDataModel() {
- return new ListDataModel(getFacade().findRange(new int[]{getPageFirstItem(), getPageFirstItem()+getPageSize()}));
+ return new ListDataModel(getFacade().findRange(new int[]{getPageFirstItem(), getPageFirstItem() + getPageSize()}));
}
};
}
@@ -82,7 +83,7 @@ public class MovieController implements
}
public String prepareView() {
- current = (Movie)getItems().getRowData();
+ current = (Movie) getItems().getRowData();
selectedItemIndex = pagination.getPageFirstItem() + getItems().getRowIndex();
return "View";
}
@@ -105,7 +106,7 @@ public class MovieController implements
}
public String prepareEdit() {
- current = (Movie)getItems().getRowData();
+ current = (Movie) getItems().getRowData();
selectedItemIndex = pagination.getPageFirstItem() + getItems().getRowIndex();
return "Edit";
}
@@ -122,7 +123,7 @@ public class MovieController implements
}
public String destroy() {
- current = (Movie)getItems().getRowData();
+ current = (Movie) getItems().getRowData();
selectedItemIndex = pagination.getPageFirstItem() + getItems().getRowIndex();
performDestroy();
recreateModel();
@@ -155,14 +156,14 @@ public class MovieController implements
int count = getFacade().count();
if (selectedItemIndex >= count) {
// selected index cannot be bigger than number of items:
- selectedItemIndex = count-1;
+ selectedItemIndex = count - 1;
// go to previous page if last page disappeared:
if (pagination.getPageFirstItem() >= count) {
pagination.previousPage();
}
}
if (selectedItemIndex >= 0) {
- current = getFacade().findRange(new int[]{selectedItemIndex, selectedItemIndex+1}).get(0);
+ current = getFacade().findRange(new int[]{selectedItemIndex, selectedItemIndex + 1}).get(0);
}
}
@@ -197,14 +198,14 @@ public class MovieController implements
return JsfUtil.getSelectItems(ejbFacade.getMovies(), true);
}
- @FacesConverter(forClass=Movie.class)
+ @FacesConverter(forClass = Movie.class)
public static class MovieControllerConverter implements Converter {
public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
if (value == null || value.length() == 0) {
return null;
}
- MovieController controller = (MovieController)facesContext.getApplication().getELResolver().
+ MovieController controller = (MovieController) facesContext.getApplication().getELResolver().
getValue(facesContext.getELContext(), null, "movieController");
return controller.ejbFacade.find(getKey(value));
}
@@ -229,7 +230,7 @@ public class MovieController implements
Movie o = (Movie) object;
return getStringKey(o.getId());
} else {
- throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: "+MovieController.class.getName());
+ throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + MovieController.class.getName());
}
}
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MoviesImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MoviesImpl.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MoviesImpl.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/MoviesImpl.java Sun Apr 10 14:49:26 2011
@@ -16,8 +16,6 @@
*/
package org.superbiz.moviefun;
-import java.util.List;
-
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
@@ -31,6 +29,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.EntityType;
+import java.util.List;
@LocalBean
@Stateless(name = "Movies")
@@ -46,70 +45,70 @@ public class MoviesImpl implements Movie
private EntityManager entityManager;
@Override
- public Movie find(Long id) {
+ public Movie find(Long id) {
return entityManager.find(Movie.class, id);
}
-
+
@Override
- public void addMovie(Movie movie) {
+ public void addMovie(Movie movie) {
entityManager.persist(movie);
}
-
+
@Override
- public void editMovie(Movie movie) {
+ public void editMovie(Movie movie) {
entityManager.merge(movie);
}
@Override
- public void deleteMovie(Movie movie) {
+ public void deleteMovie(Movie movie) {
entityManager.remove(movie);
notifier.notify("Deleted Movie \"" + movie.getTitle() + "\" (" + movie.getYear() + ")");
}
@Override
- public void deleteMovieId(long id) {
+ public void deleteMovieId(long id) {
Movie movie = entityManager.find(Movie.class, id);
entityManager.remove(movie);
}
@Override
- public List<Movie> getMovies() {
- CriteriaQuery<Movie> cq = entityManager.getCriteriaBuilder().createQuery(Movie.class);
+ public List<Movie> getMovies() {
+ CriteriaQuery<Movie> cq = entityManager.getCriteriaBuilder().createQuery(Movie.class);
cq.select(cq.from(Movie.class));
return entityManager.createQuery(cq).getResultList();
}
@Override
- public List<Movie> findByTitle(String title) {
- return findByStringField("title", title);
+ public List<Movie> findByTitle(String title) {
+ return findByStringField("title", title);
}
- @Override
- public List<Movie> findByGenre(String genre) {
- return findByStringField("genre", genre);
+ @Override
+ public List<Movie> findByGenre(String genre) {
+ return findByStringField("genre", genre);
}
@Override
- public List<Movie> findByDirector(String director) {
- return findByStringField("director", director);
+ public List<Movie> findByDirector(String director) {
+ return findByStringField("director", director);
}
-
+
private List<Movie> findByStringField(String fieldname, String param) {
- CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Movie> query = builder.createQuery(Movie.class);
- Root<Movie> root = query.from(Movie.class);
- EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
-
- Path<String> path = root.get(type.getDeclaredSingularAttribute(fieldname, String.class));
- Predicate condition = builder.like(path, "%" + param + "%");
-
- query.where(condition);
-
- return entityManager.createQuery(query).getResultList();
- }
+ CriteriaBuilder builder = entityManager.getCriteriaBuilder();
+ CriteriaQuery<Movie> query = builder.createQuery(Movie.class);
+ Root<Movie> root = query.from(Movie.class);
+ EntityType<Movie> type = entityManager.getMetamodel().entity(Movie.class);
+
+ Path<String> path = root.get(type.getDeclaredSingularAttribute(fieldname, String.class));
+ Predicate condition = builder.like(path, "%" + param + "%");
+
+ query.where(condition);
- @Override
- public List<Movie> findRange(int[] range) {
+ return entityManager.createQuery(query).getResultList();
+ }
+
+ @Override
+ public List<Movie> findRange(int[] range) {
CriteriaQuery<Movie> cq = entityManager.getCriteriaBuilder().createQuery(Movie.class);
cq.select(cq.from(Movie.class));
TypedQuery<Movie> q = entityManager.createQuery(cq);
@@ -119,7 +118,7 @@ public class MoviesImpl implements Movie
}
@Override
- public int count() {
+ public int count() {
CriteriaQuery<Long> cq = entityManager.getCriteriaBuilder().createQuery(Long.class);
Root<Movie> rt = cq.from(Movie.class);
cq.select(entityManager.getCriteriaBuilder().count(rt));
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/JsfUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/JsfUtil.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/JsfUtil.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/JsfUtil.java Sun Apr 10 14:49:26 2011
@@ -16,15 +16,15 @@
*/
package org.superbiz.moviefun.util;
-import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.model.SelectItem;
+import java.util.List;
public class JsfUtil {
-
+
public static SelectItem[] getSelectItems(List<?> entities, boolean selectOne) {
int size = selectOne ? entities.size() + 1 : entities.size();
SelectItem[] items = new SelectItem[size];
@@ -38,7 +38,7 @@ public class JsfUtil {
}
return items;
}
-
+
public static void addErrorMessage(Exception ex, String defaultMsg) {
String msg = ex.getLocalizedMessage();
if (msg != null && msg.length() > 0) {
@@ -47,7 +47,7 @@ public class JsfUtil {
addErrorMessage(defaultMsg);
}
}
-
+
public static void addErrorMessages(List<String> messages) {
for (String message : messages) {
addErrorMessage(message);
@@ -63,14 +63,14 @@ public class JsfUtil {
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
FacesContext.getCurrentInstance().addMessage("successInfo", facesMsg);
}
-
+
public static String getRequestParameter(String key) {
return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(key);
}
-
+
public static Object getObjectFromRequestParameter(String requestParameterName, Converter converter, UIComponent component) {
String theId = JsfUtil.getRequestParameter(requestParameterName);
return converter.getAsObject(FacesContext.getCurrentInstance(), component, theId);
}
-
+
}
\ No newline at end of file
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/PaginationHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/PaginationHelper.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/PaginationHelper.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/java/org/superbiz/moviefun/util/PaginationHelper.java Sun Apr 10 14:49:26 2011
@@ -32,11 +32,11 @@ public abstract class PaginationHelper {
public abstract DataModel createPageDataModel();
public int getPageFirstItem() {
- return page*pageSize;
+ return page * pageSize;
}
public int getPageLastItem() {
- int i = getPageFirstItem() + pageSize -1;
+ int i = getPageFirstItem() + pageSize - 1;
int count = getItemsCount() - 1;
if (i > count) {
i = count;
@@ -48,7 +48,7 @@ public abstract class PaginationHelper {
}
public boolean isHasNextPage() {
- return (page+1)*pageSize+1 <= getItemsCount();
+ return (page + 1) * pageSize + 1 <= getItemsCount();
}
public void nextPage() {
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/resources/META-INF/persistence.xml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/resources/META-INF/persistence.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/resources/META-INF/persistence.xml Sun Apr 10 14:49:26 2011
@@ -16,14 +16,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
- <persistence-unit name="movie-unit">
- <jta-data-source>movieDatabase</jta-data-source>
- <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
- <class>org.superbiz.moviefun.Movie</class>
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="movie-unit">
+ <jta-data-source>movieDatabase</jta-data-source>
+ <non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
+ <class>org.superbiz.moviefun.Movie</class>
- <properties>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- </properties>
- </persistence-unit>
+ <properties>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ </properties>
+ </persistence-unit>
</persistence>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/faces-config.xml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/faces-config.xml Sun Apr 10 14:49:26 2011
@@ -17,13 +17,13 @@
limitations under the License.
-->
<faces-config version="2.0"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
- <application>
- <resource-bundle>
- <base-name>/Bundle</base-name>
- <var>bundle</var>
- </resource-bundle>
- </application>
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+ <application>
+ <resource-bundle>
+ <base-name>/Bundle</base-name>
+ <var>bundle</var>
+ </resource-bundle>
+ </application>
</faces-config>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/web.xml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/WEB-INF/web.xml Sun Apr 10 14:49:26 2011
@@ -16,25 +16,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
- <param-value>Development</param-value>
- </context-param>
- <servlet>
- <servlet-name>ActionServlet</servlet-name>
- <servlet-class>org.superbiz.moviefun.ActionServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>ActionServlet</servlet-name>
+ <servlet-class>org.superbiz.moviefun.ActionServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
</web-app>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/default.css
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/default.css?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/default.css (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/default.css Sun Apr 10 14:49:26 2011
@@ -1,177 +1,238 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+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 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
+ http:
+
+/
+/
+www.apache.org
+
+/
+licenses
+
+/
+LICENSE-2
- 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.
+.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.
+
-->
body, p, td, table, tr, .bodytext, .stepfield {
- font-family: Verdana, arial, sans-serif;
- font-size: 11px;
- line-height: 16px;
- color: #000000;
- font-weight: normal;
+ font-family: Verdana, arial, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+ color: #000000;
+ font-weight: normal;
}
body {
- margin: 0px;
- padding: 0px;
- text-align: center;
- background-color: #f0f0f0;
+ margin: 0px;
+ padding: 0px;
+ text-align: center;
+ background-color: #f0f0f0;
}
#Content {
- text-align: left;
- background-color: #fff;
- padding: 0px;
- margin: 0px;
+ text-align: left;
+ background-color: #fff;
+ padding: 0px;
+ margin: 0px;
}
HR {
- color: 3c78b5;
- height: 1;
+ color: 3 c78b5;
+ height: 1;
}
A:link, A:visited, A:active, A:hover {
- color: #003366;
+ color: #003366;
}
h1 A:link, h1 A:visited, h1 A:active {
- text-decoration: none;
+ text-decoration: none;
}
h1 A:hover {
- border-bottom: 1px dotted #003366;
+ border-bottom: 1px dotted #003366;
}
input {
- font-family: verdana, geneva, arial, sans-serif;
- font-size: 11px;
- color: #000000;
+ font-family: verdana, geneva, arial, sans-serif;
+ font-size: 11px;
+ color: #000000;
}
h1 {
- font-size: 24px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- color: #003366;
- border-bottom: 1px solid #3c78b5;
- padding: 2px;
- margin: 36px 0px 4px 0px;
+ font-size: 24px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ color: #003366;
+ border-bottom: 1px solid #3c78b5;
+ padding: 2px;
+ margin: 36px 0px 4px 0px;
}
h2 {
- font-size: 18px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- border-bottom: 1px solid #3c78b5;
- padding: 2px;
- margin: 27px 0px 4px 0px;
+ font-size: 18px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ border-bottom: 1px solid #3c78b5;
+ padding: 2px;
+ margin: 27px 0px 4px 0px;
}
h3 {
- font-size: 14px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- padding: 2px;
- margin: 21px 0px 4px 0px;
+ font-size: 14px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 21px 0px 4px 0px;
}
h4 {
- font-size: 12px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- padding: 2px;
- margin: 18px 0px 4px 0px;
+ font-size: 12px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 18px 0px 4px 0px;
}
h4.search {
- font-size: 12px;
- line-height: normal;
- font-weight: normal;
- background-color: #f0f0f0;
- padding: 4px;
- margin: 18px 0px 4px 0px;
+ font-size: 12px;
+ line-height: normal;
+ font-weight: normal;
+ background-color: #f0f0f0;
+ padding: 4px;
+ margin: 18px 0px 4px 0px;
}
h5 {
- font-size: 10px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- padding: 2px;
- margin: 14px 0px 4px 0px;
+ font-size: 10px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 14px 0px 4px 0px;
}
h6 {
- font-size: 8px;
- line-height: normal;
- font-weight: bold;
- background-color: #f0f0f0;
- padding: 2px;
- margin: 14px 0px 4px 0px;
+ font-size: 8px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 14px 0px 4px 0px;
}
.smalltext {
- color: #666666;
- font-size: 10px;
+ color: #666666;
+ font-size: 10px;
}
+
.smalltext a {
- color: #666666;
+ color: #666666;
}
.tableview table {
- margin: 0;
+ margin: 0;
}
.tableview th {
- text-align: left;
- color: #003366;
- font-size: 12px;
- padding: 5px 0px 0px 5px;
- border-bottom: 2px solid #3c78b5;
+ text-align: left;
+ color: #003366;
+ font-size: 12px;
+ padding: 5px 0px 0px 5px;
+ border-bottom: 2px solid #3c78b5;
}
+
.tableview td {
- text-align: left;
- border-color: #ccc;
- border-width: 0px 0px 1px 0px;
- border-style: solid;
- margin: 0;
- padding: 4px 10px 4px 5px;
+ text-align: left;
+ border-color: #ccc;
+ border-width: 0px 0px 1px 0px;
+ border-style: solid;
+ margin: 0;
+ padding: 4px 10px 4px 5px;
}
.bottomshadow {
- height: 12px;
- background-image: url("/images/border/border_bottom.gif");
- background-repeat: repeat-x;
+ height: 12px;
+ background-image: url("/images/border/border_bottom.gif");
+ background-repeat: repeat-x;
+}
+
+.topBarDiv a:link {
+ color: white;
+}
+
+.topBarDiv a:visited {
+ color: white;
+}
+
+.topBarDiv a:active {
+ color: white;
+}
+
+.topBarDiv a:hover {
+ color: white;
}
-.topBarDiv a:link {color: white;}
-.topBarDiv a:visited {color: white;}
-.topBarDiv a:active {color: white;}
-.topBarDiv a:hover {color: white;}
-.topBarDiv {color: white;}
+.topBarDiv {
+ color: white;
+}
.topBar td {
- background-color: #003366;
+ background-color: #003366;
+}
+
+.basicPanelContainer {
+ border: 1px solid #3c78b5;
+ margin-top: 2px;
+ margin-bottom: 8px;
+ width: 100%
}
+.basicPanelTitle {
+ padding: 5px;
+ margin: 0px;
+ background-color: #f0f0f0;
+ color: black;
+ font-weight: bold;
+}
-.basicPanelContainer {border: 1px solid #3c78b5; margin-top: 2px; margin-bottom: 8px; width: 100%}
-.basicPanelTitle {padding: 5px; margin: 0px; background-color: #f0f0f0; color: black; font-weight: bold;}
-.basicPanelBody {padding: 5px; margin: 0px}
+.basicPanelBody {
+ padding: 5px;
+ margin: 0px
+}
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.jsp?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.jsp (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.jsp Sun Apr 10 14:49:26 2011
@@ -13,19 +13,20 @@
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.
---%>
+--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head><title>Moviefun :: Index</title>
-<link rel="stylesheet" href="default.css" type="text/css" />
+ <link rel="stylesheet" href="default.css" type="text/css"/>
</head>
<body>
<p/>
+
<div id="Content">
- <p>Please select one of the following links:</p>
- <a href="setup.jsp">Setup</a> - Sets up the application with some sample data<br />
- <a href="moviefun.jsp">JSP</a> - Use the JSP version of the application<br />
- <a href="faces/index.xhtml">JSF</a> - Use the JSF 2 version of the application<br />
+ <p>Please select one of the following links:</p>
+ <a href="setup.jsp">Setup</a> - Sets up the application with some sample data<br/>
+ <a href="moviefun.jsp">JSP</a> - Use the JSP version of the application<br/>
+ <a href="faces/index.xhtml">JSF</a> - Use the JSF 2 version of the application<br/>
<div class="bottomshadow"></div>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml Sun Apr 10 14:49:26 2011
@@ -16,19 +16,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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:h="http://java.sun.com/jsf/html">
- <h:head>
- <title>Moviefun Sample Application :: JSF 2.0</title>
-<h:outputStylesheet name="css/jsfcrud.css"/>
- </h:head>
- <h:body>
- Welcome to the Moviefun sample application!
- <h:form>
- <h:commandLink action="/movie/List" value="Show All Movie Items"/>
- </h:form>
- </h:body>
+<h:head>
+ <title>Moviefun Sample Application :: JSF 2.0</title>
+ <h:outputStylesheet name="css/jsfcrud.css"/>
+</h:head>
+<h:body>
+ Welcome to the Moviefun sample application!
+ <h:form>
+ <h:commandLink action="/movie/List" value="Show All Movie Items"/>
+ </h:form>
+</h:body>
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Create.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Create.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Create.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Create.xhtml Sun Apr 10 14:49:26 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,39 +23,40 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="/template.xhtml">
- <ui:define name="title">
- <h:outputText value="#{bundle.CreateMovieTitle}"></h:outputText>
- </ui:define>
- <ui:define name="body">
- <h:panelGroup id="messagePanel" layout="block">
- <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
- </h:panelGroup>
- <h:form>
- <h:panelGrid columns="2">
- <h:outputLabel value="#{bundle.CreateMovieLabel_id}" for="id" />
- <h:inputText id="id" value="#{movieController.selected.id}" title="#{bundle.CreateMovieTitle_id}" />
- <h:outputLabel value="#{bundle.CreateMovieLabel_director}" for="director" />
- <h:inputText id="director" value="#{movieController.selected.director}" title="#{bundle.CreateMovieTitle_director}" />
- <h:outputLabel value="#{bundle.CreateMovieLabel_title}" for="title" />
- <h:inputText id="title" value="#{movieController.selected.title}" title="#{bundle.CreateMovieTitle_title}" />
- <h:outputLabel value="#{bundle.CreateMovieLabel_year}" for="year" />
- <h:inputText id="year" value="#{movieController.selected.year}" title="#{bundle.CreateMovieTitle_year}" />
- <h:outputLabel value="#{bundle.CreateMovieLabel_genre}" for="genre" />
- <h:inputText id="genre" value="#{movieController.selected.genre}" title="#{bundle.CreateMovieTitle_genre}" />
- <h:outputLabel value="#{bundle.CreateMovieLabel_rating}" for="rating" />
- <h:inputText id="rating" value="#{movieController.selected.rating}" title="#{bundle.CreateMovieTitle_rating}" />
- </h:panelGrid>
- <br />
- <h:commandLink action="#{movieController.create}" value="#{bundle.CreateMovieSaveLink}" />
- <br />
- <br />
- <h:commandLink action="#{movieController.prepareList}" value="#{bundle.CreateMovieShowAllLink}" immediate="true"/>
- <br />
- <br />
- <h:commandLink value="#{bundle.CreateMovieIndexLink}" action="/index" immediate="true" />
- </h:form>
- </ui:define>
- </ui:composition>
+<ui:composition template="/template.xhtml">
+ <ui:define name="title">
+ <h:outputText value="#{bundle.CreateMovieTitle}"></h:outputText>
+ </ui:define>
+ <ui:define name="body">
+ <h:panelGroup id="messagePanel" layout="block">
+ <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
+ </h:panelGroup>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputLabel value="#{bundle.CreateMovieLabel_id}" for="id"/>
+ <h:inputText id="id" value="#{movieController.selected.id}" title="#{bundle.CreateMovieTitle_id}"/>
+ <h:outputLabel value="#{bundle.CreateMovieLabel_director}" for="director"/>
+ <h:inputText id="director" value="#{movieController.selected.director}"
+ title="#{bundle.CreateMovieTitle_director}"/>
+ <h:outputLabel value="#{bundle.CreateMovieLabel_title}" for="title"/>
+ <h:inputText id="title" value="#{movieController.selected.title}" title="#{bundle.CreateMovieTitle_title}"/>
+ <h:outputLabel value="#{bundle.CreateMovieLabel_year}" for="year"/>
+ <h:inputText id="year" value="#{movieController.selected.year}" title="#{bundle.CreateMovieTitle_year}"/>
+ <h:outputLabel value="#{bundle.CreateMovieLabel_genre}" for="genre"/>
+ <h:inputText id="genre" value="#{movieController.selected.genre}" title="#{bundle.CreateMovieTitle_genre}"/>
+ <h:outputLabel value="#{bundle.CreateMovieLabel_rating}" for="rating"/>
+ <h:inputText id="rating" value="#{movieController.selected.rating}" title="#{bundle.CreateMovieTitle_rating}"/>
+ </h:panelGrid>
+ <br/>
+ <h:commandLink action="#{movieController.create}" value="#{bundle.CreateMovieSaveLink}"/>
+ <br/>
+ <br/>
+ <h:commandLink action="#{movieController.prepareList}" value="#{bundle.CreateMovieShowAllLink}" immediate="true"/>
+ <br/>
+ <br/>
+ <h:commandLink value="#{bundle.CreateMovieIndexLink}" action="/index" immediate="true"/>
+ </h:form>
+ </ui:define>
+</ui:composition>
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Edit.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Edit.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Edit.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/Edit.xhtml Sun Apr 10 14:49:26 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,40 +23,41 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="/template.xhtml">
- <ui:define name="title">
- <h:outputText value="#{bundle.EditMovieTitle}"></h:outputText>
- </ui:define>
- <ui:define name="body">
- <h:panelGroup id="messagePanel" layout="block">
- <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
- </h:panelGroup>
- <h:form>
- <h:panelGrid columns="2">
- <h:outputLabel value="#{bundle.EditMovieLabel_id}" for="id" />
- <h:inputText id="id" value="#{movieController.selected.id}" title="#{bundle.EditMovieTitle_id}" />
- <h:outputLabel value="#{bundle.EditMovieLabel_director}" for="director" />
- <h:inputText id="director" value="#{movieController.selected.director}" title="#{bundle.EditMovieTitle_director}" />
- <h:outputLabel value="#{bundle.EditMovieLabel_title}" for="title" />
- <h:inputText id="title" value="#{movieController.selected.title}" title="#{bundle.EditMovieTitle_title}" />
- <h:outputLabel value="#{bundle.EditMovieLabel_year}" for="year" />
- <h:inputText id="year" value="#{movieController.selected.year}" title="#{bundle.EditMovieTitle_year}" />
- <h:outputLabel value="#{bundle.EditMovieLabel_genre}" for="genre" />
- <h:inputText id="genre" value="#{movieController.selected.genre}" title="#{bundle.EditMovieTitle_genre}" />
- <h:outputLabel value="#{bundle.EditMovieLabel_rating}" for="rating" />
- <h:inputText id="rating" value="#{movieController.selected.rating}" title="#{bundle.EditMovieTitle_rating}" />
- </h:panelGrid>
- <h:commandLink action="#{movieController.update}" value="#{bundle.EditMovieSaveLink}"/>
- <br />
- <br />
- <h:commandLink action="View" value="#{bundle.EditMovieViewLink}" immediate="true"/>
- <br />
- <h:commandLink action="#{movieController.prepareList}" value="#{bundle.EditMovieShowAllLink}" immediate="true"/>
- <br />
- <br />
- <h:commandLink value="#{bundle.EditMovieIndexLink}" action="/index" immediate="true" />
- </h:form>
- </ui:define>
- </ui:composition>
+<ui:composition template="/template.xhtml">
+ <ui:define name="title">
+ <h:outputText value="#{bundle.EditMovieTitle}"></h:outputText>
+ </ui:define>
+ <ui:define name="body">
+ <h:panelGroup id="messagePanel" layout="block">
+ <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
+ </h:panelGroup>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputLabel value="#{bundle.EditMovieLabel_id}" for="id"/>
+ <h:inputText id="id" value="#{movieController.selected.id}" title="#{bundle.EditMovieTitle_id}"/>
+ <h:outputLabel value="#{bundle.EditMovieLabel_director}" for="director"/>
+ <h:inputText id="director" value="#{movieController.selected.director}"
+ title="#{bundle.EditMovieTitle_director}"/>
+ <h:outputLabel value="#{bundle.EditMovieLabel_title}" for="title"/>
+ <h:inputText id="title" value="#{movieController.selected.title}" title="#{bundle.EditMovieTitle_title}"/>
+ <h:outputLabel value="#{bundle.EditMovieLabel_year}" for="year"/>
+ <h:inputText id="year" value="#{movieController.selected.year}" title="#{bundle.EditMovieTitle_year}"/>
+ <h:outputLabel value="#{bundle.EditMovieLabel_genre}" for="genre"/>
+ <h:inputText id="genre" value="#{movieController.selected.genre}" title="#{bundle.EditMovieTitle_genre}"/>
+ <h:outputLabel value="#{bundle.EditMovieLabel_rating}" for="rating"/>
+ <h:inputText id="rating" value="#{movieController.selected.rating}" title="#{bundle.EditMovieTitle_rating}"/>
+ </h:panelGrid>
+ <h:commandLink action="#{movieController.update}" value="#{bundle.EditMovieSaveLink}"/>
+ <br/>
+ <br/>
+ <h:commandLink action="View" value="#{bundle.EditMovieViewLink}" immediate="true"/>
+ <br/>
+ <h:commandLink action="#{movieController.prepareList}" value="#{bundle.EditMovieShowAllLink}" immediate="true"/>
+ <br/>
+ <br/>
+ <h:commandLink value="#{bundle.EditMovieIndexLink}" action="/index" immediate="true"/>
+ </h:form>
+ </ui:define>
+</ui:composition>
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/List.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/List.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/List.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/List.xhtml Sun Apr 10 14:49:26 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,76 +23,84 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="/template.xhtml">
- <ui:define name="title">
- <h:outputText value="#{bundle.ListMovieTitle}"></h:outputText>
- </ui:define>
- <ui:define name="body">
- <h:form styleClass="jsfcrud_list_form">
- <h:panelGroup id="messagePanel" layout="block">
- <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
- </h:panelGroup>
- <h:outputText escape="false" value="#{bundle.ListMovieEmpty}" rendered="#{movieController.items.rowCount == 0}"/>
- <h:panelGroup rendered="#{movieController.items.rowCount > 0}">
- <h:outputText value="#{movieController.pagination.pageFirstItem + 1}..#{movieController.pagination.pageLastItem + 1}/#{movieController.pagination.itemsCount}"/>
- <h:commandLink action="#{movieController.previous}" value="#{bundle.Previous} #{movieController.pagination.pageSize}" rendered="#{movieController.pagination.hasPreviousPage}"/>
- <h:commandLink action="#{movieController.next}" value="#{bundle.Next} #{movieController.pagination.pageSize}" rendered="#{movieController.pagination.hasNextPage}"/>
- <h:dataTable value="#{movieController.items}" var="item" border="0" cellpadding="2" cellspacing="0" rowClasses="jsfcrud_odd_row,jsfcrud_even_row" rules="all" style="border:solid 1px">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_id}"/>
- </f:facet>
- <h:outputText value="#{item.id}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_director}"/>
- </f:facet>
- <h:outputText value="#{item.director}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_title}"/>
- </f:facet>
- <h:outputText value="#{item.title}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_year}"/>
- </f:facet>
- <h:outputText value="#{item.year}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_genre}"/>
- </f:facet>
- <h:outputText value="#{item.genre}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.ListMovieTitle_rating}"/>
- </f:facet>
- <h:outputText value="#{item.rating}"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value=" "/>
- </f:facet>
- <h:commandLink action="#{movieController.prepareView}" value="#{bundle.ListMovieViewLink}"/>
- <h:outputText value=" "/>
- <h:commandLink action="#{movieController.prepareEdit}" value="#{bundle.ListMovieEditLink}"/>
- <h:outputText value=" "/>
- <h:commandLink action="#{movieController.destroy}" value="#{bundle.ListMovieDestroyLink}"/>
- </h:column>
- </h:dataTable>
- </h:panelGroup>
- <br />
- <h:commandLink action="#{movieController.prepareCreate}" value="#{bundle.ListMovieCreateLink}"/>
- <br />
- <br />
- <h:commandLink value="#{bundle.ListMovieIndexLink}" action="/index" immediate="true" />
- </h:form>
- </ui:define>
- </ui:composition>
+<ui:composition template="/template.xhtml">
+ <ui:define name="title">
+ <h:outputText value="#{bundle.ListMovieTitle}"></h:outputText>
+ </ui:define>
+ <ui:define name="body">
+ <h:form styleClass="jsfcrud_list_form">
+ <h:panelGroup id="messagePanel" layout="block">
+ <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
+ </h:panelGroup>
+ <h:outputText escape="false" value="#{bundle.ListMovieEmpty}" rendered="#{movieController.items.rowCount == 0}"/>
+ <h:panelGroup rendered="#{movieController.items.rowCount > 0}">
+ <h:outputText
+ value="#{movieController.pagination.pageFirstItem + 1}..#{movieController.pagination.pageLastItem + 1}/#{movieController.pagination.itemsCount}"/>
+
+ <h:commandLink action="#{movieController.previous}"
+ value="#{bundle.Previous} #{movieController.pagination.pageSize}"
+ rendered="#{movieController.pagination.hasPreviousPage}"/>
+
+ <h:commandLink action="#{movieController.next}" value="#{bundle.Next} #{movieController.pagination.pageSize}"
+ rendered="#{movieController.pagination.hasNextPage}"/>
+
+ <h:dataTable value="#{movieController.items}" var="item" border="0" cellpadding="2" cellspacing="0"
+ rowClasses="jsfcrud_odd_row,jsfcrud_even_row" rules="all" style="border:solid 1px">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_id}"/>
+ </f:facet>
+ <h:outputText value="#{item.id}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_director}"/>
+ </f:facet>
+ <h:outputText value="#{item.director}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_title}"/>
+ </f:facet>
+ <h:outputText value="#{item.title}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_year}"/>
+ </f:facet>
+ <h:outputText value="#{item.year}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_genre}"/>
+ </f:facet>
+ <h:outputText value="#{item.genre}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.ListMovieTitle_rating}"/>
+ </f:facet>
+ <h:outputText value="#{item.rating}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value=" "/>
+ </f:facet>
+ <h:commandLink action="#{movieController.prepareView}" value="#{bundle.ListMovieViewLink}"/>
+ <h:outputText value=" "/>
+ <h:commandLink action="#{movieController.prepareEdit}" value="#{bundle.ListMovieEditLink}"/>
+ <h:outputText value=" "/>
+ <h:commandLink action="#{movieController.destroy}" value="#{bundle.ListMovieDestroyLink}"/>
+ </h:column>
+ </h:dataTable>
+ </h:panelGroup>
+ <br/>
+ <h:commandLink action="#{movieController.prepareCreate}" value="#{bundle.ListMovieCreateLink}"/>
+ <br/>
+ <br/>
+ <h:commandLink value="#{bundle.ListMovieIndexLink}" action="/index" immediate="true"/>
+ </h:form>
+ </ui:define>
+</ui:composition>
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/View.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/View.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/View.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/movie/View.xhtml Sun Apr 10 14:49:26 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,44 +23,44 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="/template.xhtml">
- <ui:define name="title">
- <h:outputText value="#{bundle.ViewMovieTitle}"></h:outputText>
- </ui:define>
- <ui:define name="body">
- <h:panelGroup id="messagePanel" layout="block">
- <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
- </h:panelGroup>
- <h:form>
- <h:panelGrid columns="2">
- <h:outputText value="#{bundle.ViewMovieLabel_id}"/>
- <h:outputText value="#{movieController.selected.id}" title="#{bundle.ViewMovieTitle_id}"/>
- <h:outputText value="#{bundle.ViewMovieLabel_director}"/>
- <h:outputText value="#{movieController.selected.director}" title="#{bundle.ViewMovieTitle_director}"/>
- <h:outputText value="#{bundle.ViewMovieLabel_title}"/>
- <h:outputText value="#{movieController.selected.title}" title="#{bundle.ViewMovieTitle_title}"/>
- <h:outputText value="#{bundle.ViewMovieLabel_year}"/>
- <h:outputText value="#{movieController.selected.year}" title="#{bundle.ViewMovieTitle_year}"/>
- <h:outputText value="#{bundle.ViewMovieLabel_genre}"/>
- <h:outputText value="#{movieController.selected.genre}" title="#{bundle.ViewMovieTitle_genre}"/>
- <h:outputText value="#{bundle.ViewMovieLabel_rating}"/>
- <h:outputText value="#{movieController.selected.rating}" title="#{bundle.ViewMovieTitle_rating}"/>
- </h:panelGrid>
- <br />
- <h:commandLink action="#{movieController.destroyAndView}" value="#{bundle.ViewMovieDestroyLink}"/>
- <br />
- <br />
- <h:commandLink action="Edit" value="#{bundle.ViewMovieEditLink}"/>
- <br />
- <h:commandLink action="#{movieController.prepareCreate}" value="#{bundle.ViewMovieCreateLink}" />
- <br />
- <h:commandLink action="#{movieController.prepareList}" value="#{bundle.ViewMovieShowAllLink}"/>
- <br />
- <br />
- <h:commandLink value="#{bundle.ViewMovieIndexLink}" action="/index" immediate="true" />
-
- </h:form>
- </ui:define>
- </ui:composition>
+<ui:composition template="/template.xhtml">
+ <ui:define name="title">
+ <h:outputText value="#{bundle.ViewMovieTitle}"></h:outputText>
+ </ui:define>
+ <ui:define name="body">
+ <h:panelGroup id="messagePanel" layout="block">
+ <h:messages errorStyle="color: red" infoStyle="color: green" layout="table"/>
+ </h:panelGroup>
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputText value="#{bundle.ViewMovieLabel_id}"/>
+ <h:outputText value="#{movieController.selected.id}" title="#{bundle.ViewMovieTitle_id}"/>
+ <h:outputText value="#{bundle.ViewMovieLabel_director}"/>
+ <h:outputText value="#{movieController.selected.director}" title="#{bundle.ViewMovieTitle_director}"/>
+ <h:outputText value="#{bundle.ViewMovieLabel_title}"/>
+ <h:outputText value="#{movieController.selected.title}" title="#{bundle.ViewMovieTitle_title}"/>
+ <h:outputText value="#{bundle.ViewMovieLabel_year}"/>
+ <h:outputText value="#{movieController.selected.year}" title="#{bundle.ViewMovieTitle_year}"/>
+ <h:outputText value="#{bundle.ViewMovieLabel_genre}"/>
+ <h:outputText value="#{movieController.selected.genre}" title="#{bundle.ViewMovieTitle_genre}"/>
+ <h:outputText value="#{bundle.ViewMovieLabel_rating}"/>
+ <h:outputText value="#{movieController.selected.rating}" title="#{bundle.ViewMovieTitle_rating}"/>
+ </h:panelGrid>
+ <br/>
+ <h:commandLink action="#{movieController.destroyAndView}" value="#{bundle.ViewMovieDestroyLink}"/>
+ <br/>
+ <br/>
+ <h:commandLink action="Edit" value="#{bundle.ViewMovieEditLink}"/>
+ <br/>
+ <h:commandLink action="#{movieController.prepareCreate}" value="#{bundle.ViewMovieCreateLink}"/>
+ <br/>
+ <h:commandLink action="#{movieController.prepareList}" value="#{bundle.ViewMovieShowAllLink}"/>
+ <br/>
+ <br/>
+ <h:commandLink value="#{bundle.ViewMovieIndexLink}" action="/index" immediate="true"/>
+
+ </h:form>
+ </ui:define>
+</ui:composition>
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp Sun Apr 10 14:49:26 2011
@@ -13,7 +13,7 @@
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.
---%>
+--%>
<%@ page import="org.superbiz.moviefun.Movie,
org.superbiz.moviefun.Movies,
javax.naming.InitialContext,
@@ -94,111 +94,121 @@
%>
<html>
<head><title>Moviefun :: Index</title>
-<link rel="stylesheet" href="default.css" type="text/css" />
+ <link rel="stylesheet" href="default.css" type="text/css"/>
</head>
<body>
<p/>
+
<div id="Content">
-<table>
-<tr>
-<td>
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr class="topBar">
- <td align="left" width="85%">
- <span class="topBarDiv">Mini-Movie Application</span>
- </td>
- <td align="right" valign="middle" width="1%" nowrap>
- <form method="POST" action="moviefun.jsp" name="findMovie" style="padding: 1px; margin: 1px">
- <select name="action">
- <option value="findByTitle">Title</option>
- <option value="findByDirector">Director</option>
- <option value="findByGenre">Genre</option>
- </select>
- <input type="text" name="key" size="20"/>
- <input type="submit" value="Search"/>
- </form>
- </td>
- </tr>
- </table>
+ <table>
+ <tr>
+ <td>
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr class="topBar">
+ <td align="left" width="85%">
+ <span class="topBarDiv">Mini-Movie Application</span>
+ </td>
+ <td align="right" valign="middle" width="1%" nowrap>
+ <form method="POST" action="moviefun.jsp" name="findMovie"
+ style="padding: 1px; margin: 1px">
+ <select name="action">
+ <option value="findByTitle">Title</option>
+ <option value="findByDirector">Director</option>
+ <option value="findByGenre">Genre</option>
+ </select>
+ <input type="text" name="key" size="20"/>
+ <input type="submit" value="Search"/>
+ </form>
+ </td>
+ </tr>
+ </table>
-</td>
-</tr>
-<tr>
-<td>
- <div class="basicPanelContainer" style="width: 100%">
-
- <div class="basicPanelTitle">Movies</div>
-
- <div class="basicPanelBody">
- <form method="POST" action="moviefun.jsp" name="listMovies" style="padding: 1px; margin: 1px">
- <table class="tableview" width="100%" cellspacing="0" cellpadding="0" style="padding: 5px">
- <tr>
- <th>Title</th>
- <th>Director</th>
- <th>Genre</th>
- <th>Rating</th>
- <th>Year</th>
- <th> </th>
- </tr>
- <%
- int start = listIterator.nextIndex();
- for (int i=display; i > 0 && listIterator.hasNext(); i-- ) {
- Movie movie = (Movie) listIterator.next();
- %>
- <tr>
- <td width="200"><%=movie.getTitle()%></td>
- <td width="120"><%=movie.getDirector()%></td>
- <td width="90"><%=movie.getGenre()%></td>
- <td width="50"><%=movie.getRating()%></td>
- <td width="50"><%=movie.getYear()%></td>
- <td><input type="checkbox" name="id" value="<%=movie.getId()%>"></td>
- </tr>
-
- <% } %>
- </table>
- <table width="100%" cellspacing="0" cellpadding="0" style="padding: 5px">
- <tr>
+ </td>
+ </tr>
+ <tr>
<td>
- <% if (start!=0&&listIterator.hasPrevious()){%><input type="submit" name="action" value="<<"/><%}%>
+ <div class="basicPanelContainer" style="width: 100%">
- <%=start+1%> - <%=listIterator.nextIndex()%> of <%=movies.size()%>
+ <div class="basicPanelTitle">Movies</div>
- <% if (listIterator.hasNext()){%><input type="submit" name="action" value=">>"/><%}%>
- </td>
- <td align="right">
- <input type="submit" name="action" value="Remove"/>
+ <div class="basicPanelBody">
+ <form method="POST" action="moviefun.jsp" name="listMovies" style="padding: 1px; margin: 1px">
+ <table class="tableview" width="100%" cellspacing="0" cellpadding="0" style="padding: 5px">
+ <tr>
+ <th>Title</th>
+ <th>Director</th>
+ <th>Genre</th>
+ <th>Rating</th>
+ <th>Year</th>
+ <th> </th>
+ </tr>
+ <%
+ int start = listIterator.nextIndex();
+ for (int i = display; i > 0 && listIterator.hasNext(); i--) {
+ Movie movie = (Movie) listIterator.next();
+ %>
+ <tr>
+ <td width="200"><%=movie.getTitle()%>
+ </td>
+ <td width="120"><%=movie.getDirector()%>
+ </td>
+ <td width="90"><%=movie.getGenre()%>
+ </td>
+ <td width="50"><%=movie.getRating()%>
+ </td>
+ <td width="50"><%=movie.getYear()%>
+ </td>
+ <td><input type="checkbox" name="id" value="<%=movie.getId()%>"></td>
+ </tr>
+
+ <% } %>
+ </table>
+ <table width="100%" cellspacing="0" cellpadding="0" style="padding: 5px">
+ <tr>
+ <td>
+ <% if (start != 0 && listIterator.hasPrevious()) {%><input type="submit"
+ name="action"
+ value="<<"/><%}%>
+
+ <%=start + 1%> - <%=listIterator.nextIndex()%> of <%=movies.size()%>
+
+ <% if (listIterator.hasNext()) {%><input type="submit" name="action"
+ value=">>"/><%}%>
+ </td>
+ <td align="right">
+ <input type="submit" name="action" value="Remove"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
</td>
- </tr>
- </table>
- </form>
- </div>
- </div>
-</td>
-</tr>
-<tr>
-<td>
- <div class="basicPanelContainer" style="width: 100%">
- <div class="basicPanelTitle">Add</div>
- <div class="basicPanelBody">
- <form method="POST" action="moviefun.jsp" name="addMovie" style="padding: 1px; margin: 1px">
- <table width="100%" cellspacing="0" cellpadding="0" style="padding: 0px">
- <tr>
- <td width="200"><input type="text" name="title" size="29"/></td>
- <td width="120"><input type="text" name="director" size="17"/></td>
- <td width="90"><input type="text" name="genre" size="14"/></td>
- <td width="50"><input type="text" name="rating" size="7"/></td>
- <td width="50"><input type="text" name="year" size="4"/></td>
- <td><input type="submit" name="action" value="Add"/></td>
- </tr>
- </table>
- </form>
+ </tr>
+ <tr>
+ <td>
+ <div class="basicPanelContainer" style="width: 100%">
+ <div class="basicPanelTitle">Add</div>
+ <div class="basicPanelBody">
+ <form method="POST" action="moviefun.jsp" name="addMovie" style="padding: 1px; margin: 1px">
+ <table width="100%" cellspacing="0" cellpadding="0" style="padding: 0px">
+ <tr>
+ <td width="200"><input type="text" name="title" size="29"/></td>
+ <td width="120"><input type="text" name="director" size="17"/></td>
+ <td width="90"><input type="text" name="genre" size="14"/></td>
+ <td width="50"><input type="text" name="rating" size="7"/></td>
+ <td width="50"><input type="text" name="year" size="4"/></td>
+ <td><input type="submit" name="action" value="Add"/></td>
+ </tr>
+ </table>
+ </form>
- </div>
- </div>
-</td>
-</tr>
-</table>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
<div class="bottomshadow"></div>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/resources/css/jsfcrud.css
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/resources/css/jsfcrud.css?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/resources/css/jsfcrud.css (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/resources/css/jsfcrud.css Sun Apr 10 14:49:26 2011
@@ -1,99 +1,128 @@
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+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 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
+ http:
+
+/
+/
+www.apache.org
+
+/
+licenses
- 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.
+/
+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.
+
-->
-root {
- display: block;
+root {
+ display: block;
}
body {
- font-family: Arial, Helvetica, sans-serif;
- color: #3a4f54;
- background-color: #dfecf1;
- font-size: small;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #3a4f54;
+ background-color: #dfecf1;
+ font-size: small;
}
a {
- color: #e33b06;
+ color: #e33b06;
}
table {
- empty-cells: show;
+ empty-cells: show;
}
form.jsfcrud_list_form th, td th {
- font-size: x-small;
- color: #4e6a71;
- border-top-style: solid;
- border-bottom-style: solid;
- border-left-style: solid;
- border-right-style: solid;
- border-top-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-right-width: 1px;
- border-top-color: #b2d5d6;
- border-bottom-color: #b2d5d6;
- border-left-color: #90b4bd;
- border-right-color: #90b4bd;
- letter-spacing: 3px;
- text-align: left;
- padding-top: 6px;
- padding-bottom: 6px;
- padding-left: 6px;
- padding-right: 6px;
- background-color: #b2d5d6;
+ font-size: x-small;
+ color: #4e6a71;
+ border-top-style: solid;
+ border-bottom-style: solid;
+ border-left-style: solid;
+ border-right-style: solid;
+ border-top-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-right-width: 1px;
+ border-top-color: #b2d5d6;
+ border-bottom-color: #b2d5d6;
+ border-left-color: #90b4bd;
+ border-right-color: #90b4bd;
+ letter-spacing: 3px;
+ text-align: left;
+ padding-top: 6px;
+ padding-bottom: 6px;
+ padding-left: 6px;
+ padding-right: 6px;
+ background-color: #b2d5d6;
}
td {
- vertical-align: top;
- padding-bottom: 8px;
- font-size: small;
+ vertical-align: top;
+ padding-bottom: 8px;
+ font-size: small;
}
form.jsfcrud_list_form td, td td {
- border-top-style: solid;
- border-bottom-style: solid;
- border-left-style: solid;
- border-right-style: solid;
- border-top-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-right-width: 1px;
- border-top-color: #b2d5d6;
- border-bottom-color: #b2d5d6;
- border-left-color: #b2d5d6;
- border-right-color: #b2d5d6;
- vertical-align: baseline;
- padding-bottom: 0px;
+ border-top-style: solid;
+ border-bottom-style: solid;
+ border-left-style: solid;
+ border-right-style: solid;
+ border-top-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-right-width: 1px;
+ border-top-color: #b2d5d6;
+ border-bottom-color: #b2d5d6;
+ border-left-color: #b2d5d6;
+ border-right-color: #b2d5d6;
+ vertical-align: baseline;
+ padding-bottom: 0px;
}
tr.jsfcrud_odd_row {
- background-color: #fefeff;
- color: #4e6a71;
+ background-color: #fefeff;
+ color: #4e6a71;
}
-
tr.jsfcrud_even_row {
- background-color: #eff5fa;
- color: #4e6a71;
+ background-color: #eff5fa;
+ color: #4e6a71;
}
#busyImage {
- position: absolute;
- left: 50%;
- top: 50%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
}
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/setup.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/setup.jsp?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/setup.jsp (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/setup.jsp Sun Apr 10 14:49:26 2011
@@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ page import=" java.util.Iterator"%>
+<%@ page import=" org.superbiz.moviefun.Movie" %>
<%@ page import="org.superbiz.moviefun.Movies" %>
<%@ page import="javax.naming.InitialContext" %>
-<%@ page import="org.superbiz.moviefun.Movie" %>
+<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %>
<h2>Setup</h2>
@@ -25,37 +25,40 @@
InitialContext initialContext = new InitialContext();
Movies moviesBean = (Movies) initialContext.lookup("java:comp/env/movies");
- moviesBean.addMovie(new Movie("Wedding Crashers", "David Dobkin", "Comedy", 7 , 2005));
- moviesBean.addMovie(new Movie("Starsky & Hutch", "Todd Phillips", "Action", 6 , 2004));
- moviesBean.addMovie(new Movie("Shanghai Knights", "David Dobkin", "Action", 6 , 2003));
- moviesBean.addMovie(new Movie("I-Spy", "Betty Thomas", "Adventure", 5 , 2002));
- moviesBean.addMovie(new Movie("The Royal Tenenbaums", "Wes Anderson", "Comedy", 8 , 2001));
- moviesBean.addMovie(new Movie("Zoolander", "Ben Stiller", "Comedy", 6 , 2001));
- moviesBean.addMovie(new Movie("Shanghai Noon", "Tom Dey", "Comedy", 7 , 2000));
+ moviesBean.addMovie(new Movie("Wedding Crashers", "David Dobkin", "Comedy", 7, 2005));
+ moviesBean.addMovie(new Movie("Starsky & Hutch", "Todd Phillips", "Action", 6, 2004));
+ moviesBean.addMovie(new Movie("Shanghai Knights", "David Dobkin", "Action", 6, 2003));
+ moviesBean.addMovie(new Movie("I-Spy", "Betty Thomas", "Adventure", 5, 2002));
+ moviesBean.addMovie(new Movie("The Royal Tenenbaums", "Wes Anderson", "Comedy", 8, 2001));
+ moviesBean.addMovie(new Movie("Zoolander", "Ben Stiller", "Comedy", 6, 2001));
+ moviesBean.addMovie(new Movie("Shanghai Noon", "Tom Dey", "Comedy", 7, 2000));
%>
Done!
<h2>Seeded Database with the Following movies</h2>
<table width="500">
-<tr>
-<td><b>Title</b></td>
-<td><b>Director</b></td>
-<td><b>Genre</b></td>
-</tr>
-<%
- List<Movie> movies = moviesBean.getMovies();
- for (Iterator iterator = movies.iterator(); iterator.hasNext();) {
- Movie movie = (Movie) iterator.next();
-%>
-<tr>
-<td><%=movie.getTitle()%></td>
-<td><%=movie.getDirector()%></td>
-<td><%=movie.getGenre()%></td>
-</tr>
+ <tr>
+ <td><b>Title</b></td>
+ <td><b>Director</b></td>
+ <td><b>Genre</b></td>
+ </tr>
+ <%
+ List<Movie> movies = moviesBean.getMovies();
+ for (Iterator iterator = movies.iterator(); iterator.hasNext();) {
+ Movie movie = (Movie) iterator.next();
+ %>
+ <tr>
+ <td><%=movie.getTitle()%>
+ </td>
+ <td><%=movie.getDirector()%>
+ </td>
+ <td><%=movie.getGenre()%>
+ </td>
+ </tr>
-<%
- }
-%>
+ <%
+ }
+ %>
</table>
<h2>Continue</h2>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml Sun Apr 10 14:49:26 2011
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8' ?>
+<?xml version='1.0' encoding='UTF-8' ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,23 +16,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!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">
- <h:head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title><ui:insert name="title">Moviefun</ui:insert></title>
-<h:outputStylesheet name="css/jsfcrud.css"/>
- </h:head>
-
- <h:body>
- <h1>
- <ui:insert name="title">Default Title</ui:insert>
- </h1>
- <p>
- <ui:insert name="body">Default Body</ui:insert>
- </p>
- </h:body>
-
+<h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>
+ <ui:insert name="title">Moviefun</ui:insert>
+ </title>
+ <h:outputStylesheet name="css/jsfcrud.css"/>
+</h:head>
+
+<h:body>
+ <h1>
+ <ui:insert name="title">Default Title</ui:insert>
+ </h1>
+ <p>
+ <ui:insert name="body">Default Body</ui:insert>
+ </p>
+</h:body>
+
</html>
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesIT.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesIT.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesIT.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesIT.java Sun Apr 10 14:49:26 2011
@@ -16,55 +16,54 @@
*/
package org.superbiz.moviefun;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-
-import org.junit.Test;
-
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.DomNodeList;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.junit.Test;
+
+import java.util.Iterator;
+
+import static org.junit.Assert.assertTrue;
public class MoviesIT {
- @Test
- public void testShouldMakeSureWebappIsWorking() throws Exception {
- WebClient webClient = new WebClient();
- HtmlPage page = webClient.getPage("http://localhost:9999/moviefun/setup.jsp");
-
- assertMoviesPresent(page);
-
- page = webClient.getPage("http://localhost:9999/moviefun/faces/movie/List.xhtml");
-
- assertMoviesPresent(page);
- webClient.closeAllWindows();
- }
-
- private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
- assertTrue(pageAsText.contains("Wedding Crashers"));
- assertTrue(pageAsText.contains("Starsky & Hutch"));
- assertTrue(pageAsText.contains("Shanghai Knights"));
- assertTrue(pageAsText.contains("I-Spy"));
- assertTrue(pageAsText.contains("The Royal Tenenbaums"));
- assertTrue(pageAsText.contains("Zoolander"));
- assertTrue(pageAsText.contains("Shanghai Noon"));
- }
-
- private void clickOnLink(HtmlPage page, String lookFor) throws Exception {
- DomNodeList<HtmlElement> links = page.getElementsByTagName("a");
- Iterator<HtmlElement> iterator = links.iterator();
- while (iterator.hasNext()) {
- HtmlAnchor anchor = (HtmlAnchor) iterator.next();
-
- if (lookFor.equals(anchor.getTextContent())) {
- anchor.click();
- break;
- }
- }
- }
-
+ @Test
+ public void testShouldMakeSureWebappIsWorking() throws Exception {
+ WebClient webClient = new WebClient();
+ HtmlPage page = webClient.getPage("http://localhost:9999/moviefun/setup.jsp");
+
+ assertMoviesPresent(page);
+
+ page = webClient.getPage("http://localhost:9999/moviefun/faces/movie/List.xhtml");
+
+ assertMoviesPresent(page);
+ webClient.closeAllWindows();
+ }
+
+ private void assertMoviesPresent(HtmlPage page) {
+ String pageAsText = page.asText();
+ assertTrue(pageAsText.contains("Wedding Crashers"));
+ assertTrue(pageAsText.contains("Starsky & Hutch"));
+ assertTrue(pageAsText.contains("Shanghai Knights"));
+ assertTrue(pageAsText.contains("I-Spy"));
+ assertTrue(pageAsText.contains("The Royal Tenenbaums"));
+ assertTrue(pageAsText.contains("Zoolander"));
+ assertTrue(pageAsText.contains("Shanghai Noon"));
+ }
+
+ private void clickOnLink(HtmlPage page, String lookFor) throws Exception {
+ DomNodeList<HtmlElement> links = page.getElementsByTagName("a");
+ Iterator<HtmlElement> iterator = links.iterator();
+ while (iterator.hasNext()) {
+ HtmlAnchor anchor = (HtmlAnchor) iterator.next();
+
+ if (lookFor.equals(anchor.getTextContent())) {
+ anchor.click();
+ break;
+ }
+ }
+ }
+
}
Modified: openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java?rev=1090810&r1=1090809&r2=1090810&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java Sun Apr 10 14:49:26 2011
@@ -17,18 +17,17 @@
package org.superbiz.moviefun;
import junit.framework.TestCase;
+import org.apache.openejb.api.LocalClient;
+import javax.annotation.Resource;
+import javax.ejb.EJB;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.ejb.EJB;
-import javax.transaction.UserTransaction;
-import javax.annotation.Resource;
-import javax.persistence.PersistenceContext;
import javax.persistence.EntityManager;
-import java.util.Properties;
+import javax.persistence.PersistenceContext;
+import javax.transaction.UserTransaction;
import java.util.List;
-
-import org.apache.openejb.api.LocalClient;
+import java.util.Properties;
@LocalClient
public class MoviesTest extends TestCase {