[webbeans-commits] Webbeans SVN: r3753 - in examples/trunk: jsf and 11 other directories.

Author: pete.muir(a)jboss.org Date: 2009-09-22 17:51:05 -0400 (Tue, 22 Sep 2009) New Revision: 3753 Added: examples/trunk/jsf/numberguess/src/main/webapp-jboss5/ examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/ examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/web.xml examples/trunk/jsf/numberguess/src/main/webapp-jetty/ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml examples/trunk/jsf/numberguess/src/main/webapp-tomcat/ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml Removed: examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/web.xml examples/trunk/jsf/numberguess/src/main/webapp/style/ examples/trunk/jsf/servlet-numberguess/ Modified: examples/trunk/build.xml examples/trunk/jsf/numberguess/build.xml examples/trunk/jsf/numberguess/pom.xml examples/trunk/jsf/numberguess/readme.txt Log: initial merge of servlet-numberguess and numberguess Modified: examples/trunk/build.xml =================================================================== --- examples/trunk/build.xml 2009-09-22 20:43:00 UTC (rev 3752) +++ examples/trunk/build.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -37,6 +37,12 @@ </maven> </target> + <target name="clean"> + <maven target="clean" basedir="${basedir}"> + <arg line="-f ${pom.file}" /> + </maven> + </target> + <target name="explode" depends="package"> <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}" /> <copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}"> @@ -61,12 +67,6 @@ <echo message="The app can be accessed at ${final.url}" /> </target> - <target name="clean"> - <maven target="clean" basedir="${basedir}"> - <arg line="-f ${pom.file}" /> - </maven> - </target> - <target name="restart.war" depends="explode" if="war"> <touch file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml" /> </target> Modified: examples/trunk/jsf/numberguess/build.xml =================================================================== --- examples/trunk/jsf/numberguess/build.xml 2009-09-22 20:43:00 UTC (rev 3752) +++ examples/trunk/jsf/numberguess/build.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -4,4 +4,16 @@ <import file="../../build.xml" /> + <target name="package"> + <maven target="install" basedir="${basedir}"> + <arg line="-Pjboss5" /> + </maven> + </target> + + <target name="clean"> + <maven target="clean" basedir="${basedir}"> + <arg line="-Pjboss5" /> + </maven> + </target> + </project> Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2009-09-22 20:43:00 UTC (rev 3752) +++ examples/trunk/jsf/numberguess/pom.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -11,19 +11,21 @@ <groupId>org.jboss.webbeans.examples.jsf</groupId> <artifactId>webbeans-jsf-numberguess</artifactId> <packaging>war</packaging> - <name>Web Beans Examples: Numberguess for JBoss AS 5.x</name> + <name>Web Beans Examples: Numberguess</name> <pluginRepositories> <pluginRepository> - <id>codehaus snapshot repository</id> - <url>http://snapshots.repository.codehaus.org/</url> + <id>codehaus repository</id> + <url>http://repository.codehaus.org/</url> <releases> <enabled>true</enabled> </releases> </pluginRepository> </pluginRepositories> + <!-- Common dependencies only --> <dependencies> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> @@ -36,16 +38,21 @@ <artifactId>jsr299-api</artifactId> <scope>provided</scope> </dependency> - + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> <groupId>javax.el</groupId> @@ -53,18 +60,222 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - + </dependencies> + <profiles> + <profile> + <id>jboss5</id> + <dependencies> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp-jboss5</directory> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tomcat</id> + <dependencies> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp-tomcat</directory> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jetty</id> + <dependencies> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp-jetty</directory> + <filtering>false</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <build> <finalName>webbeans-numberguess</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <failOnError>false</failOnError> + <filesets> + <fileset> + <!-- clean up files from war:inplace --> + <directory>WebContent</directory> + <includes> + <include>WEB-INF/classes/**</include> + <include>WEB-INF/lib/**</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <configuration> + <path>/${project.build.finalName}</path> + <!-- uncomment to use server configuration override; see readme.txt for details --> + <!--<server>tomcat</server>--> + <url>http://localhost:${tomcat.http.port}/manager</url> + <port>${embedded-tomcat.http.port}</port> <!-- port for embedded Tomcat only (putting this configuration in the execution for the run goal doesn't work) --> + <!-- if you don't want to use war:inplace, use this path instead --> + <!-- + <warSourceDirectory>${project.build.directory}/${project.build.finalName}</warSourceDirectory> + --> + </configuration> + </plugin> + + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <configuration> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.http.port}</port> + <maxIdleTime>3600000</maxIdleTime> + </connector> + </connectors> + <scanIntervalSeconds>10</scanIntervalSeconds> + <webAppConfig> + <contextPath>/${project.build.finalName}</contextPath> + </webAppConfig> + <!-- if you don't want to use war:inplace, use this path instead --> + <!-- + <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory> + --> + </configuration> + </plugin> + + <plugin> + <groupId>org.twdata.maven</groupId> + <artifactId>maven-cli-plugin</artifactId> + <configuration> + <userAliases> + <runjetty>compile org.apache.maven.plugins:maven-war-plugin:inplace org.mortbay.jetty:maven-jetty-plugin:run</runjetty> + <runtomcat>compile org.apache.maven.plugins:maven-war-plugin:inplace org.codehaus.mojo:tomcat-maven-plugin:run</runtomcat> + <explode>compile org.apache.maven.plugins:maven-war-plugin:inplace -o</explode> + </userAliases> + </configuration> + </plugin> + + </plugins> </build> + <properties> + <jetty.http.port>9090</jetty.http.port> + <jetty.debug.port>9190</jetty.debug.port> + <tomcat.http.port>8080</tomcat.http.port> + <embedded-tomcat.http.port>9090</embedded-tomcat.http.port> + <embedded-tomcat.debug.port>9190</embedded-tomcat.debug.port> + </properties> + </project> Modified: examples/trunk/jsf/numberguess/readme.txt =================================================================== --- examples/trunk/jsf/numberguess/readme.txt 2009-09-22 20:43:00 UTC (rev 3752) +++ examples/trunk/jsf/numberguess/readme.txt 2009-09-22 21:51:05 UTC (rev 3753) @@ -2,8 +2,9 @@ ================================================= This example demonstrates the use of Web Beans in a Servlet container -environment (Tomcat 6 / Jetty 6) and in JBoss AS. No alterations are expected to be made to the -Servlet container. All services are self-contained within the deployment. +environment (Tomcat 6 / Jetty 6) and in JBoss AS. No alterations are +expected to be made to the Servlet container. All services are +self-contained within the deployment. This example uses a Maven 2 build. Execute the following command to build the WAR. The WAR will will be located in the target directory after completion of @@ -17,19 +18,19 @@ Run this command to execute the application in an embedded Jetty 6 container: - mvn war:inplace jetty:run + mvn war:inplace jetty:run -Pjetty You can also execute the application in an embedded Tomcat 6 container: - mvn war:inplace tomcat:run + mvn war:inplace tomcat:run -Ptomcat -In both cases, any changes to assets in WebContent take affect immediately. If +In both cases, any changes to assets in src/main/webapp take affect immediately. If a change to a webapp configuration file is made, the application may automatically redeploy. The redeploy behavior can be fined tuned in the plugin configuration (at least for Jetty). If you make a change to a classpath resource, you need to execute a build: - mvn compile war:inplace + mvn compile war:inplace {-Ptomcat,-Pjetty} Note that war:inplace copies the compiled classes and JARs inside WebContent, under WEB-INF/classes and WEB-INF/lib, respectively, mixing source and compiled @@ -52,26 +53,18 @@ appropriate values and uncomment the <server> element inside the tomcat-maven-plugin configuration in the pom.xml. -You can deploy the packaged archive to Tomcat via HTTP PUT using this command: - - mvn package tomcat:deploy - -Then you use this command to undeploy the application: - - mvn tomcat:undeploy - -Instead of packaging the WAR, you can deploy it as an exploded archive +You can deploy it as an exploded archive immediately after the war goal is finished assembling the exploded structure: - mvn compile war:exploded tomcat:exploded + mvn compile war:exploded tomcat:exploded -Ptomcat Once the application is deployed, you can redeploy it using the following command: - mvn tomcat:redeploy + mvn tomcat:redeploy -Ptomcat But likely you want to run one or more build goals first before you redeploy: - mvn compile tomcat:redeploy - mvn war:exploded tomcat:redeploy - mvn compile war:exploded tomcat:redeploy + mvn compile tomcat:redeploy -Ptomcat + mvn war:exploded tomcat:redeploy -Ptomcat + mvn compile war:exploded tomcat:redeploy -Ptomcat Deleted: examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/web.xml 2009-09-22 20:43:00 UTC (rev 3752) +++ examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/web.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.5" - 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_2_5.xsd"> - - <display-name>Web Beans Numberguess example</display-name> - - <!-- JSF --> - - <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>*.jsf</url-pattern> - </servlet-mapping> - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Copied: examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/web.xml (from rev 3719, examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/web.xml) =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/web.xml (rev 0) +++ examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/web.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" + 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_2_5.xsd"> + + <display-name>Web Beans Numberguess example</display-name> + + <!-- JSF --> + + <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>*.jsf</url-pattern> + </servlet-mapping> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Property changes on: examples/trunk/jsf/numberguess/src/main/webapp-jboss5/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml (rev 0) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -0,0 +1,16 @@ +<?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> Property changes on: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml (rev 0) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app 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_2_5.xsd" + version="2.5"> + + <display-name>Web Beans Numberguess example</display-name> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <listener> + <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + </listener> + + <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>*.jsf</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + + <resource-env-ref> + <description>Object factory for the JCDI Manager</description> + <resource-env-ref-name>app/Manager</resource-env-ref-name> + <resource-env-ref-type>javax.inject.manager.Manager</resource-env-ref-type> + </resource-env-ref> + +</web-app> Property changes on: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml (rev 0) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + <Manager pathname=""/> <!-- disables storage of sessions across restarts --> + <Resource name="app/Manager" + auth="Container" + type="javax.inject.manager.Manager" + factory="org.jboss.webbeans.resources.ManagerObjectFactory"/> + <!-- Uncomment to enable injection into Servlet --> + <!-- <Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener"/> --> +</Context> Added: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml (rev 0) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml 2009-09-22 21:51:05 UTC (rev 3753) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app 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_2_5.xsd" + version="2.5"> + + <display-name>Web Beans Numberguess example</display-name> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <listener> + <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + </listener> + + <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>*.jsf</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + + <resource-env-ref> + <description>Object factory for the JCDI Manager</description> + <resource-env-ref-name>app/Manager</resource-env-ref-name> + <resource-env-ref-type>javax.inject.manager.Manager</resource-env-ref-type> + </resource-env-ref> + +</web-app> Property changes on: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain