Author: shane.bryzak(a)jboss.com Date: 2009-10-10 00:23:56 -0400 (Sat, 10 Oct 2009) New Revision: 3922 Removed: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/ Modified: examples/trunk/jsf/login/build.xml examples/trunk/jsf/numberguess/build.xml examples/trunk/jsf/numberguess/readme.txt examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 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 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/META-INF/context.xml examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml examples/trunk/jsf/translator/build.xml examples/trunk/jsf/translator/ear/pom.xml examples/trunk/jsf/translator/ejb/pom.xml examples/trunk/jsf/translator/war/pom.xml examples/trunk/readme.txt examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java examples/trunk/se/numberguess/readme.txt examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java examples/trunk/wicket/gae/readme.txt examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml examples/trunk/wicket/gae/war/WEB-INF/web.xml examples/trunk/wicket/numberguess/build.xml examples/trunk/wicket/numberguess/pom.xml examples/trunk/wicket/numberguess/readme.txt examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java examples/trunk/wicket/numberguess/src/main/resources/log4j.properties examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml Log: rename all instance of webbeans to weld Modified: examples/trunk/jsf/login/build.xml =================================================================== --- examples/trunk/jsf/login/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/login/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Login Example Build" default="restart"> - <property name="example.name" value="webbeans-login" /> + <property name="example.name" value="weld-login" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/numberguess/build.xml =================================================================== --- examples/trunk/jsf/numberguess/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Numberguess Example Build" default="restart"> - <property name="example.name" value="webbeans-numberguess" /> + <property name="example.name" value="weld-numberguess" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/numberguess/readme.txt =================================================================== --- examples/trunk/jsf/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,9 +1,9 @@ -Web Beans Numberguess Example -============================== +Weld Numberguess Example +======================== -This example demonstrates the use of Web Beans in a Servlet container +This example demonstrates the use of Weld in a Servlet container (Tomcat 6 / Jetty 6) and in as a non-EJB application JBoss AS. No alterations -are expeccted to be made to the container. All services are +are expected to be made to the container. All services are self-contained within the deployment. This example uses a Maven 2 build, and an ant script to deploy to JBoss AS. @@ -20,7 +20,7 @@ jboss.home as the key. Now, type ant restart to deploy the application to JBoss AS. You can access it -at http://localhost:8080/webbeans-numberguess +at http://localhost:8080/weld-numberguess == Deploying with an embedded servlet container @@ -78,7 +78,7 @@ mvn war:exploded tomcat:redeploy -Ptomcat mvn compile war:exploded tomcat:redeploy -Ptomcat -The application is available at http://localhost:8080/webbeans-numberguess +The application is available at http://localhost:8080/weld-numberguess == Launching Jetty embedded from Eclipse @@ -107,4 +107,4 @@ mvn war:inplace -Dgae -Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine \ No newline at end of file +Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine Modified: examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties =================================================================== --- examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 2009-10-10 04:23:56 UTC (rev 3922) @@ -5,6 +5,6 @@ log4j.rootLogger=INFO,Stdout -log4j.logger.org.jboss.webbeans=DEBUG +log4j.logger.org.jboss.weld=DEBUG 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-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>webbeans-numberguess</application> + <application>weld-numberguess</application> <version>2</version> <!-- Configure java.util.logging --> @@ -10,4 +10,4 @@ <sessions-enabled>true</sessions-enabled> -</appengine-web-app> \ No newline at end of file +</appengine-web-app> 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-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ 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> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -24,7 +24,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: 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 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -8,7 +8,7 @@ <Arg> <New class="javax.naming.Reference"> <Arg>javax.enterprise.inject.spi.BeanManager</Arg> - <Arg>org.jboss.webbeans.resources.ManagerObjectFactory</Arg> + <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg> <Arg/> </New> </Arg> Modified: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ 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> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -12,7 +12,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ <Resource name="BeanManager" auth="Container" type="javax.enterprise.inject.spi.BeanManager" - factory="org.jboss.webbeans.resources.ManagerObjectFactory"/> + factory="org.jboss.weld.resources.ManagerObjectFactory"/> <!-- Uncomment to enable injection into Servlet --> - <!-- <Listener className="org.jboss.webbeans.environment.tomcat.WebBeansLifecycleListener"/> --> + <!-- <Listener className="org.jboss.weld.environment.tomcat.WeldLifecycleListener"/> --> </Context> Modified: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ 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> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -12,7 +12,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: examples/trunk/jsf/translator/build.xml =================================================================== --- examples/trunk/jsf/translator/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Translator Example Build" default="restart"> - <property name="example.name" value="webbeans-translator" /> + <property name="example.name" value="weld-translator" /> <property name="type" value="ear" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/translator/ear/pom.xml =================================================================== --- examples/trunk/jsf/translator/ear/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/ear/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ear</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ear</artifactId> <packaging>ear</packaging> - <name>Web Beans Examples: Translator (ear)</name> + <name>Weld Examples: Translator (ear)</name> <pluginRepositories> <pluginRepository> @@ -26,14 +26,14 @@ <dependencies> <dependency> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ejb</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ejb</artifactId> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> <type>war</type> </dependency> @@ -58,7 +58,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -66,9 +66,9 @@ <configuration> <modules> <webModule> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> - <contextRoot>/webbeans-translator</contextRoot> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> + <contextRoot>/weld-translator</contextRoot> </webModule> </modules> </configuration> Modified: examples/trunk/jsf/translator/ejb/pom.xml =================================================================== --- examples/trunk/jsf/translator/ejb/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/ejb/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ejb</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ejb</artifactId> <packaging>ejb</packaging> - <name>Web Beans Examples: Translator (ejb)</name> + <name>Weld Examples: Translator (ejb)</name> <pluginRepositories> <pluginRepository> @@ -32,8 +32,8 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> @@ -46,7 +46,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> </build> </project> Modified: examples/trunk/jsf/translator/war/pom.xml =================================================================== --- examples/trunk/jsf/translator/war/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/war/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> <packaging>war</packaging> - <name>Web Beans Examples: Translator (war)</name> + <name>Weld Examples: Translator (war)</name> <pluginRepositories> <pluginRepository> @@ -51,7 +51,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> </build> </project> Modified: examples/trunk/readme.txt =================================================================== --- examples/trunk/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,4 +1,4 @@ -Web Beans currently comes with a number of examples: +Weld currently comes with a number of examples: * numberguess (a war example for JSF) * translator (an EJB example for JSF). @@ -9,7 +9,7 @@ * servlet-numberguess (the numberguess example for using on Tomcat or Jetty) Before running the examples, you'll need to ensure your -server supports Web Beans. +server supports Weld. The examples and RI are explained in detail in the reference guide, including -how to add Web Beans support to JBoss 5, and how to deploy the examples to Tomcat +how to add Weld support to JBoss 5, and how to deploy the examples to Tomcat Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -22,7 +22,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.bindings.Parameters; +import org.jboss.weld.environment.se.bindings.Parameters; /** * Validates command line arguments, producing errors where applicable. Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -19,7 +19,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.events.ContainerInitialized; +import org.jboss.weld.environment.se.events.ContainerInitialized; import javax.inject.Inject; /** Modified: examples/trunk/se/numberguess/readme.txt =================================================================== --- examples/trunk/se/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -96,7 +96,7 @@ ------------------- As with all Web Beans SE applications, this example is executed -by starting Java with org.jboss.webbeans.environment.se.StartMain +by starting Java with org.jboss.weld.environment.se.StartMain as the main class. Of course you will need all of the relevant jar dependencies on your classpath, which is most easily done by loading the project into your favourite Maven-capable IDE and running it from there.. Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java =================================================================== --- examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -20,7 +20,7 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.events.ContainerInitialized; +import org.jboss.weld.environment.se.events.ContainerInitialized; /** * Swing-based number guess example, main application frame. Modified: examples/trunk/wicket/gae/readme.txt =================================================================== --- examples/trunk/wicket/gae/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,5 +1,5 @@ This example is similar to its sibling "numberguess" example, but implemented -with wicket and the wicket-webbeans integration. It can be deployed to google +with wicket and the wicket-weld integration. It can be deployed to google app engine using the eclipse plugin Modified: examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml =================================================================== --- examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>webbeans-wicket-numberguess</application> + <application>weld-wicket-numberguess</application> <version>1</version> <!-- Configure java.util.logging --> @@ -10,4 +10,4 @@ <sessions-enabled>true</sessions-enabled> -</appengine-web-app> \ No newline at end of file +</appengine-web-app> Modified: examples/trunk/wicket/gae/war/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/gae/war/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/war/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,14 +4,14 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>webbeans-numberguess-wicket</display-name> + <display-name>weld-numberguess-wicket</display-name> <filter> <filter-name>wicket.numberguess-example</filter-name> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <init-param> <param-name>applicationClassName</param-name> - <param-value>org.jboss.webbeans.examples.wicket.SampleApplication</param-value> + <param-value>org.jboss.weld.examples.wicket.SampleApplication</param-value> </init-param> </filter> @@ -21,7 +21,7 @@ </filter-mapping> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> Modified: examples/trunk/wicket/numberguess/build.xml =================================================================== --- examples/trunk/wicket/numberguess/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Wicket Numberguess Example Build" default="restart"> - <property name="example.name" value="webbeans-numberguess-wicket" /> + <property name="example.name" value="weld-numberguess-wicket" /> <import file="../../build.xml" /> Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,22 +3,22 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-examples-parent</artifactId> + <groupId>org.jboss.weld.examples</groupId> + <artifactId>weld-examples-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-wicket-numberguess</artifactId> + <groupId>org.jboss.weld.examples</groupId> + <artifactId>weld-wicket-numberguess</artifactId> <packaging>war</packaging> - <name>Web Beans Examples: Numberguess with wicket</name> + <name>Weld Examples: Numberguess with wicket</name> <dependencies> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> @@ -28,8 +28,8 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-wicket</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-wicket</artifactId> </dependency> <dependency> @@ -42,8 +42,8 @@ <artifactId>jsr250-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> <scope>runtime</scope> </dependency> @@ -71,7 +71,7 @@ </dependencies> <build> - <finalName>webbeans-numberguess-wicket</finalName> + <finalName>weld-numberguess-wicket</finalName> <!-- Override the resource filtering to support storing html alongside classes --> <resources> @@ -132,8 +132,8 @@ <id>jetty</id> <dependencies> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> <scope>runtime</scope> </dependency> </dependencies> Modified: examples/trunk/wicket/numberguess/readme.txt =================================================================== --- examples/trunk/wicket/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,5 +1,5 @@ This example is similar to its sibling "numberguess" example, but implemented -with wicket and the wicket-webbeans integration. It also follows the wicket +with wicket and the wicket-weld integration. It also follows the wicket standard usage of running from within eclipse with jetty. So, for example, to run the app, right-click on Start.java in the project and choose "Run as Java Application," which will launch jetty with the example. Then hit Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <html> <head> - <title>Wicket WebBeans example</title> + <title>Wicket Weld example</title> </head> <body> <h1>Guess a number...</h1> Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,8 +1,8 @@ package org.jboss.weld.examples.wicket; -import org.jboss.webbeans.wicket.WebBeansApplication; +import org.jboss.weld.wicket.WeldApplication; -public class SampleApplication extends WebBeansApplication +public class SampleApplication extends WeldApplication { @Override Modified: examples/trunk/wicket/numberguess/src/main/resources/log4j.properties =================================================================== --- examples/trunk/wicket/numberguess/src/main/resources/log4j.properties 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/resources/log4j.properties 2009-10-10 04:23:56 UTC (rev 3922) @@ -5,6 +5,6 @@ log4j.rootLogger=INFO,Stdout -log4j.logger.org.jboss.webbeans=DEBUG +log4j.logger.org.jboss.weld=DEBUG Modified: 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 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,9 +4,9 @@ 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 --> +<!-- Jboss AS has a deployer that bootstraps weld, but in jetty we need this listener --> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> </web-app> Modified: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,14 +4,14 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>webbeans-numberguess-wicket</display-name> + <display-name>weld-numberguess-wicket</display-name> <filter> <filter-name>wicket.numberguess-example</filter-name> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <init-param> <param-name>applicationClassName</param-name> - <param-value>org.jboss.webbeans.examples.wicket.SampleApplication</param-value> + <param-value>org.jboss.weld.examples.wicket.SampleApplication</param-value> </init-param> </filter>