September 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r3754 - in examples/trunk/jsf/numberguess/src/main/webapp: WEB-INF and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 17:57:30 -0400 (Tue, 22 Sep 2009) New Revision: 3754 Modified: examples/trunk/jsf/numberguess/src/main/webapp/ examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF/ Log: ignores for inplace goal Property changes on: examples/trunk/jsf/numberguess/src/main/webapp ___________________________________________________________________ Name: svn:ignore + META-INF Property changes on: examples/trunk/jsf/numberguess/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + classes lib jetty-env.xml web.xml

14 years, 7 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

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> +  <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> +  + <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> +  +  + <url>http://localhost:${tomcat.http.port}/manager</url> + <port>${embedded-tomcat.http.port}</port>  +  +  + </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> +  +  + </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> - -  - - <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> + +  + + <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=""/>  + <Resource name="app/Manager" + auth="Container" + type="javax.inject.manager.Manager" + factory="org.jboss.webbeans.resources.ManagerObjectFactory"/> +  +  +</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

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3752 - in examples/trunk/jsf/translator/war: src/main and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 16:43:00 -0400 (Tue, 22 Sep 2009) New Revision: 3752 Removed: examples/trunk/jsf/translator/war/src/main/java/ examples/trunk/jsf/translator/war/src/main/resources/ Modified: examples/trunk/jsf/translator/war/pom.xml examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/ examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/faces-config.xml Log: cleanup and switch to JSF 2 Modified: examples/trunk/jsf/translator/war/pom.xml =================================================================== --- examples/trunk/jsf/translator/war/pom.xml 2009-09-22 20:40:09 UTC (rev 3751) +++ examples/trunk/jsf/translator/war/pom.xml 2009-09-22 20:43:00 UTC (rev 3752) @@ -38,22 +38,6 @@ </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - -  - - <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> <exclusions> Property changes on: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF ___________________________________________________________________ Name: svn:ignore + .faces-config.xml.jsfdia Modified: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 20:40:09 UTC (rev 3751) +++ examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 20:43:00 UTC (rev 3752) @@ -1,11 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" +<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_1_2.xsd"> - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> </faces-config>

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3751 - in examples/trunk/jsf/login: src/main and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 16:40:09 -0400 (Tue, 22 Sep 2009) New Revision: 3751 Removed: examples/trunk/jsf/login/src/main/resources/ Modified: examples/trunk/jsf/login/pom.xml examples/trunk/jsf/login/src/main/webapp/WEB-INF/faces-config.xml Log: Switch to JSF2 Modified: examples/trunk/jsf/login/pom.xml =================================================================== --- examples/trunk/jsf/login/pom.xml 2009-09-22 20:39:47 UTC (rev 3750) +++ examples/trunk/jsf/login/pom.xml 2009-09-22 20:40:09 UTC (rev 3751) @@ -43,11 +43,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - <!-- <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> Modified: examples/trunk/jsf/login/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- examples/trunk/jsf/login/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 20:39:47 UTC (rev 3750) +++ examples/trunk/jsf/login/src/main/webapp/WEB-INF/faces-config.xml 2009-09-22 20:40:09 UTC (rev 3751) @@ -1,11 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" +<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_1_2.xsd"> - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> </faces-config>

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3750 - examples/trunk/jsf/numberguess/src/main.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 16:39:47 -0400 (Tue, 22 Sep 2009) New Revision: 3750 Removed: examples/trunk/jsf/numberguess/src/main/resources/ Log: cleanup

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3749 - examples/trunk/jsf/numberguess.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 16:38:20 -0400 (Tue, 22 Sep 2009) New Revision: 3749 Removed: examples/trunk/jsf/numberguess/pom-jboss5.xml Modified: examples/trunk/jsf/numberguess/build.xml examples/trunk/jsf/numberguess/pom.xml Log: remove facelets, fix build script Modified: examples/trunk/jsf/numberguess/build.xml =================================================================== --- examples/trunk/jsf/numberguess/build.xml 2009-09-22 20:32:40 UTC (rev 3748) +++ examples/trunk/jsf/numberguess/build.xml 2009-09-22 20:38:20 UTC (rev 3749) @@ -1,7 +1,6 @@ <project basedir="." name="Numberguess Example Build" default="restart"> <property name="example.name" value="webbeans-numberguess" /> - <property name="pom.file" value="pom-jboss5.xml" /> <import file="../../build.xml" /> Deleted: examples/trunk/jsf/numberguess/pom-jboss5.xml =================================================================== --- examples/trunk/jsf/numberguess/pom-jboss5.xml 2009-09-22 20:32:40 UTC (rev 3748) +++ examples/trunk/jsf/numberguess/pom-jboss5.xml 2009-09-22 20:38:20 UTC (rev 3749) @@ -1,86 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-examples-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-numberguess</artifactId> - <packaging>war</packaging> - <name>Web Beans Examples: Numberguess for JBoss AS 5.x</name> - - <pluginRepositories> - <pluginRepository> - <id>codehaus snapshot repository</id> - <url>http://snapshots.repository.codehaus.org/</url> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <scope>runtime</scope> - </dependency> - -  - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> - - <build> - <finalName>webbeans-numberguess</finalName> - </build> - -</project> - Modified: examples/trunk/jsf/numberguess/pom.xml =================================================================== --- examples/trunk/jsf/numberguess/pom.xml 2009-09-22 20:32:40 UTC (rev 3748) +++ examples/trunk/jsf/numberguess/pom.xml 2009-09-22 20:38:20 UTC (rev 3749) @@ -44,23 +44,6 @@ </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <scope>runtime</scope> - </dependency> - -  - - <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> <exclusions> @@ -70,6 +53,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId>

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3748 - in examples/trunk: jsf/translator and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-09-22 16:32:40 -0400 (Tue, 22 Sep 2009) New Revision: 3748 Added: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/beans.xml Removed: examples/trunk/jsf/translator/ear/src/main/ Modified: examples/trunk/build.xml examples/trunk/jsf/translator/ear/pom.xml examples/trunk/jsf/translator/pom.xml Log: fix up translator example and work around WBINT-28 Modified: examples/trunk/build.xml =================================================================== --- examples/trunk/build.xml 2009-09-22 17:58:13 UTC (rev 3747) +++ examples/trunk/build.xml 2009-09-22 20:32:40 UTC (rev 3748) @@ -32,7 +32,7 @@ <property name="artifact.dir" value="${artifact.target.dir}/${example.name}" /> <target name="package"> - <maven target="package" basedir="${basedir}"> + <maven target="install" basedir="${basedir}"> <arg line="-f ${pom.file}" /> </maven> </target> Modified: examples/trunk/jsf/translator/ear/pom.xml =================================================================== --- examples/trunk/jsf/translator/ear/pom.xml 2009-09-22 17:58:13 UTC (rev 3747) +++ examples/trunk/jsf/translator/ear/pom.xml 2009-09-22 20:32:40 UTC (rev 3748) @@ -26,14 +26,14 @@ <dependencies> <dependency> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-ejb</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-ejb</artifactId> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-war</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-war</artifactId> <type>war</type> </dependency> @@ -66,8 +66,8 @@ <configuration> <modules> <webModule> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-war</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-war</artifactId> <contextRoot>/webbeans-translator</contextRoot> </webModule> </modules> Modified: examples/trunk/jsf/translator/pom.xml =================================================================== --- examples/trunk/jsf/translator/pom.xml 2009-09-22 17:58:13 UTC (rev 3747) +++ examples/trunk/jsf/translator/pom.xml 2009-09-22 20:32:40 UTC (rev 3748) @@ -24,19 +24,19 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-war</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-war</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-ear</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-ear</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.webbeans.examples.translator</groupId> - <artifactId>webbeans-translator-ejb</artifactId> + <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> + <artifactId>webbeans-jsf-translator-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> </dependency> Added: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/beans.xml =================================================================== Property changes on: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3747 - in ri/tags/1.0.0.PREVIEW4: parent and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: rogerk Date: 2009-09-22 13:58:13 -0400 (Tue, 22 Sep 2009) New Revision: 3747 Modified: ri/tags/1.0.0.PREVIEW4/parent/pom.xml ri/tags/1.0.0.PREVIEW4/pom.xml ri/tags/1.0.0.PREVIEW4/version-matrix/pom.xml Log: minor pom changes Modified: ri/tags/1.0.0.PREVIEW4/parent/pom.xml =================================================================== --- ri/tags/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:49:04 UTC (rev 3746) +++ ri/tags/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:58:13 UTC (rev 3747) @@ -232,18 +232,14 @@ <url>http://fisheye.jboss.org/browse/WebBeans/ri</url> </scm> - <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + </distributionManagement> <reporting> <plugins> Modified: ri/tags/1.0.0.PREVIEW4/pom.xml =================================================================== --- ri/tags/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:49:04 UTC (rev 3746) +++ ri/tags/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:58:13 UTC (rev 3747) @@ -14,18 +14,14 @@ <url>http://fisheye.jboss.org/browse/WebBeans</url> </scm> - <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + </distributionManagement> <profiles> <profile> Modified: ri/tags/1.0.0.PREVIEW4/version-matrix/pom.xml =================================================================== --- ri/tags/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 17:49:04 UTC (rev 3746) +++ ri/tags/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 17:58:13 UTC (rev 3747) @@ -538,19 +538,15 @@ </build> <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - - <scm> + <repository> +  + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + </distributionManagement> + +<scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/ve...</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/versi...</developerConnection> <url>http://fisheye.jboss.org/browse/WebBeans/ri</url>

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3746 - in ri/tags/1.0.0.PREVIEW4: parent and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: rogerk Date: 2009-09-22 13:49:04 -0400 (Tue, 22 Sep 2009) New Revision: 3746 Modified: ri/tags/1.0.0.PREVIEW4/parent/pom.xml ri/tags/1.0.0.PREVIEW4/pom.xml Log: connection specifics Modified: ri/tags/1.0.0.PREVIEW4/parent/pom.xml =================================================================== --- ri/tags/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:47:33 UTC (rev 3745) +++ ri/tags/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:49:04 UTC (rev 3746) @@ -227,8 +227,8 @@ </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/pa...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/parent</developerConnection> <url>http://fisheye.jboss.org/browse/WebBeans/ri</url> </scm> Modified: ri/tags/1.0.0.PREVIEW4/pom.xml =================================================================== --- ri/tags/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:47:33 UTC (rev 3745) +++ ri/tags/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:49:04 UTC (rev 3746) @@ -9,8 +9,8 @@ <url>http://www.seamframework.org/WebBeans</url> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4</developerConnection> <url>http://fisheye.jboss.org/browse/WebBeans</url> </scm>

14 years, 7 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r3745 - in ri/branches/1.0.0.PREVIEW4: parent and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: rogerk Date: 2009-09-22 13:47:33 -0400 (Tue, 22 Sep 2009) New Revision: 3745 Modified: ri/branches/1.0.0.PREVIEW4/parent/pom.xml ri/branches/1.0.0.PREVIEW4/pom.xml Log: 1.0.0.PREVIEW4 staging branch Modified: ri/branches/1.0.0.PREVIEW4/parent/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:41:44 UTC (rev 3744) +++ ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:47:33 UTC (rev 3745) @@ -227,8 +227,8 @@ </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/pa...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/parent</developerConnection> <url>http://fisheye.jboss.org/browse/WebBeans/ri</url> </scm> Modified: ri/branches/1.0.0.PREVIEW4/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:41:44 UTC (rev 3744) +++ ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:47:33 UTC (rev 3745) @@ -9,8 +9,8 @@ <url>http://www.seamframework.org/WebBeans</url> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4</developerConnection> <url>http://fisheye.jboss.org/browse/WebBeans</url> </scm>

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits September 2009