Author: pete.muir(a)jboss.org Date: 2009-09-23 15:55:45 -0400 (Wed, 23 Sep 2009) New Revision: 3770 Removed: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/jetty-env.xml Modified: examples/trunk/jsf/numberguess/pom.xml examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml Log: various fixes to GAE example, now blocked by non-serializable objects being stored in session Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2009-09-23 19:53:54 UTC (rev 3769) +++ examples/trunk/jsf/numberguess/pom.xml 2009-09-23 19:55:45 UTC (rev 3770) @@ -48,18 +48,6 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> @@ -80,6 +68,19 @@ <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> <plugins> @@ -130,6 +131,18 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> <plugins> @@ -175,6 +188,18 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> <plugins> @@ -201,14 +226,14 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_12</version> + <version>1.2_13</version> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> <scope>runtime</scope> - <version>1.2_12</version> + <version>1.2_13</version> </dependency> <dependency> @@ -225,8 +250,15 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> + <version>1.2</version> </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-ri</artifactId> + <version>1.2</version> + </dependency> + </dependencies> <build> <plugins> @@ -310,6 +342,18 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- JETTY DEPENDENCIES FOR IN IDE TESTING --> <dependency> Modified: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml 2009-09-23 19:53:54 UTC (rev 3769) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml 2009-09-23 19:55:45 UTC (rev 3770) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> <application>webbeans-numberguess</application> - <version>1</version> + <version>2</version> <!-- Configure java.util.logging --> <system-properties> Deleted: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/jetty-env.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/jetty-env.xml 2009-09-23 19:53:54 UTC (rev 3769) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/jetty-env.xml 2009-09-23 19:55:45 UTC (rev 3770) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" - "http://jetty.mortbay.org/configure.dtd"> -<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext"> - <New id="appManager" class="org.mortbay.jetty.plus.naming.Resource"> - <Arg><Ref id="webAppCtx"/></Arg> - <Arg>app/Manager</Arg> - <Arg> - <New class="javax.naming.Reference"> - <Arg>javax.inject.manager.Manager</Arg> - <Arg>org.jboss.webbeans.resources.ManagerObjectFactory</Arg> - <Arg/> - </New> - </Arg> - </New> -</Configure> Modified: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml 2009-09-23 19:53:54 UTC (rev 3769) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml 2009-09-23 19:55:45 UTC (rev 3770) @@ -41,11 +41,5 @@ <session-config> <session-timeout>10</session-timeout> </session-config> - - <resource-env-ref> - <description>Object factory for the CDI Bean Manager</description> - <resource-env-ref-name>BeanManager</resource-env-ref-name> - <resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type> - </resource-env-ref> </web-app>