Author: jgallimore
Date: Sat Mar 19 21:11:03 2011
New Revision: 1083287
URL: http://svn.apache.org/viewvc?rev=1083287&view=rev
Log:
Correcting a merge gone wrong
Modified:
openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml
openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp
openejb/trunk/openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml
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=1083287&r1=1083286&r2=1083287&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
Sat Mar 19 21:11:03 2011
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<<<<<<< HEAD:openejb3/examples/webapps/moviefun/app/src/main/webapp/index.xhtml
<!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";>
@@ -33,16 +32,3 @@
</html>
-=======
-<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>
-</persistence>
->>>>>>>
5e093c1e798dab6d0459468205a037f7c0b6d78d:openejb3/examples/webapps/moviefun/src/main/resources/META-INF/persistence.xml
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=1083287&r1=1083286&r2=1083287&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
Sat Mar 19 21:11:03 2011
@@ -14,15 +14,92 @@
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,
+ java.util.List,
+ java.util.ListIterator" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+
+ InitialContext initialContext = new InitialContext();
+ Movies moviesBean = (Movies) initialContext.lookup("java:comp/env/movies");
+
+ List movies = null;
+ ListIterator listIterator = null;
+ int display = 5;
+ String action = request.getParameter("action");
+
+ if ("Add".equals(action)) {
+
+ String title = request.getParameter("title");
+ String director = request.getParameter("director");
+ String genre = request.getParameter("genre");
+ int rating = Integer.parseInt(request.getParameter("rating"));
+ int year = Integer.parseInt(request.getParameter("year"));
+
+ Movie movie = new Movie(title, director, genre, rating, year);
+
+ moviesBean.addMovie(movie);
+
+ } else if ("Remove".equals(action)) {
+
+ String[] ids = request.getParameterValues("id");
+ for (String id : ids) {
+ moviesBean.deleteMovieId(new Long(id));
+ }
+
+ } else if (">>".equals(action)) {
+
+ movies = (List) session.getAttribute("movies.collection");
+ listIterator = (ListIterator) session.getAttribute("movies.iterator");
+
+ } else if ("<<".equals(action)) {
+
+ movies = (List) session.getAttribute("movies.collection");
+ listIterator = (ListIterator) session.getAttribute("movies.iterator");
+ for (int i = display * 2; i > 0 && listIterator.hasPrevious(); i--) {
+ listIterator.previous(); // backup
+ }
+
+ } else if ("findByTitle".equals(action)) {
+
+ movies = moviesBean.findByTitle(request.getParameter("key"));
+
+ } else if ("findByDirector".equals(action)) {
+
+ movies = moviesBean.findByDirector(request.getParameter("key"));
+
+ } else if ("findByGenre".equals(action)) {
+
+ movies = moviesBean.findByGenre(request.getParameter("key"));
+ }
+
+ if (movies == null) {
+ try {
+ movies = moviesBean.getMovies();
+ } catch (Throwable e) {
+ // We must not have run setup yet
+ response.sendRedirect("setup.jsp");
+ return;
+ }
+ }
+
+ if (listIterator == null) {
+ listIterator = movies.listIterator();
+ }
+
+ session.setAttribute("movies.collection", movies);
+ session.setAttribute("movies.iterator", listIterator);
+%>
<html>
<head><title>Moviefun :: Index</title>
<link rel="stylesheet" href="default.css" type="text/css" />
+
</head>
<body>
<p/>
<div id="Content">
-<<<<<<<
HEAD:openejb3/examples/webapps/moviefun/app/src/main/webapp/moviefun.jsp
<table>
<tr>
<td>
@@ -122,12 +199,6 @@
</td>
</tr>
</table>
-=======
- <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 />
->>>>>>>
5e093c1e798dab6d0459468205a037f7c0b6d78d:openejb3/examples/webapps/moviefun/src/main/webapp/index.jsp
<div class="bottomshadow"></div>
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=1083287&r1=1083286&r2=1083287&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
Sat Mar 19 21:11:03 2011
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<<<<<<<
HEAD:openejb3/examples/webapps/moviefun/app/src/main/webapp/template.xhtml
<!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";
@@ -37,27 +36,3 @@
</h:body>
</html>
-=======
-<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>
->>>>>>>
5e093c1e798dab6d0459468205a037f7c0b6d78d:openejb3/examples/webapps/moviefun/src/main/webapp/WEB-INF/web.xml
