[webbeans-commits] Webbeans SVN: r2517 - in examples/trunk/wicket: conversations/src/main/java/org/jboss/webbeans/examples/conversations and 5 other directories.

Author: cpopetz Date: 2009-04-19 16:30:54 -0400 (Sun, 19 Apr 2009) New Revision: 2517 Added: examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/jetty-additions-to-web.xml examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml Modified: examples/trunk/wicket/conversations/pom.xml examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.html examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/web.xml examples/trunk/wicket/conversations/src/test/java/org/jboss/webbeans/examples/wicket/Start.java examples/trunk/wicket/numberguess/pom.xml examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/Start.java Log: Fix examples for jboss5. Modified: examples/trunk/wicket/conversations/pom.xml =================================================================== --- examples/trunk/wicket/conversations/pom.xml 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/conversations/pom.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -34,8 +34,9 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-api</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -137,4 +138,18 @@ <jetty.version>6.1.16</jetty.version> </properties> + <profiles> + <profile> + <id>jetty</id> + <dependencies> + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + </project> Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.html =================================================================== --- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.html 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.html 2009-04-19 20:30:54 UTC (rev 2517) @@ -18,7 +18,7 @@ <input type="submit" wicket:id="noop" value="noop"/><p/> <input type="submit" wicket:id="end" value="end"/><p/> <input type="submit" wicket:id="longop" value="longop"/><p/> - <a href="/">Abandon</a><p/> + <a wicket:id="abandon" href="/">Abandon</a><p/> </form> <p/> <span wicket:id="feedback"/> Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java =================================================================== --- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java 2009-04-19 20:30:54 UTC (rev 2517) @@ -12,6 +12,7 @@ import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; +import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -136,6 +137,11 @@ } } }); + + //Fake out conversation propagation by constructing a string url to ourselves, which + //won't have the propagated cid + form.add(new ExternalLink("abandon", + urlFor(HomePage.class,new PageParameters()).toString())); } } Added: examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/jetty-additions-to-web.xml =================================================================== --- examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/jetty-additions-to-web.xml (rev 0) +++ examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/jetty-additions-to-web.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + +<!-- Jboss AS has a deployer that bootstraps webbeans, but in jetty we need this listener --> + <listener> + <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + </listener> + +</web-app> Property changes on: examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/jetty-additions-to-web.xml ___________________________________________________________________ Name: svn:executable + * Modified: examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/web.xml 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/conversations/src/main/webapp/WEB-INF/web.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -20,9 +20,4 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> - </listener> - - </web-app> Modified: examples/trunk/wicket/conversations/src/test/java/org/jboss/webbeans/examples/wicket/Start.java =================================================================== --- examples/trunk/wicket/conversations/src/test/java/org/jboss/webbeans/examples/wicket/Start.java 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/conversations/src/test/java/org/jboss/webbeans/examples/wicket/Start.java 2009-04-19 20:30:54 UTC (rev 2517) @@ -17,6 +17,8 @@ bb.setServer(server); bb.setContextPath("/"); bb.setWar("src/main/webapp"); + bb.setOverrideDescriptor("src/main/webapp/WEB-INF/jetty-additions-to-web.xml"); + server.addHandler(bb); try { Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/numberguess/pom.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -33,12 +33,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-wicket</artifactId> @@ -138,4 +132,18 @@ <jetty.version>6.1.16</jetty.version> </properties> + <profiles> + <profile> + <id>jetty</id> + <dependencies> + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + </project> Added: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml =================================================================== --- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml (rev 0) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + +<!-- Jboss AS has a deployer that bootstraps webbeans, but in jetty we need this listener --> + <listener> + <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + </listener> + +</web-app> Property changes on: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml ___________________________________________________________________ Name: svn:executable + * Modified: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-04-19 20:30:54 UTC (rev 2517) @@ -20,9 +20,4 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> - </listener> - - </web-app> Modified: examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/Start.java =================================================================== --- examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/Start.java 2009-04-19 20:24:44 UTC (rev 2516) +++ examples/trunk/wicket/numberguess/src/test/java/org/jboss/webbeans/examples/wicket/Start.java 2009-04-19 20:30:54 UTC (rev 2517) @@ -17,6 +17,7 @@ bb.setServer(server); bb.setContextPath("/"); bb.setWar("src/main/webapp"); + bb.setOverrideDescriptor("src/main/webapp/WEB-INF/jetty-additions-to-web.xml"); server.addHandler(bb);