rename all instance of webbeans to weld

jsf/login/build.xml

@@ -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" />
 

jsf/numberguess/build.xml

@@ -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" />
 

jsf/numberguess/readme.txt

@@ -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 @@ Make sure you have set the path to JBoss AS in ../../local.build.properties, usi
 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 @@ But likely you want to run one or more build goals first before you redeploy:
  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 @@ Next, put all the needed resources into the src/main/webapp
 
  mvn war:inplace -Dgae
 
-Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine
+Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine

jsf/numberguess/src/jetty/resources/log4j.properties

@@ -5,6 +5,6 @@ log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n
 
 log4j.rootLogger=INFO,Stdout
 
-log4j.logger.org.jboss.webbeans=DEBUG
+log4j.logger.org.jboss.weld=DEBUG
 
 

jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml

@@ -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>
+</appengine-web-app>

jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml

@@ -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>

jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml

@@ -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>

jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml

@@ -4,15 +4,15 @@
    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>
       <param-value>.xhtml</param-value>
    </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>

jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml

@@ -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>

jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml

@@ -4,15 +4,15 @@
    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>
       <param-value>.xhtml</param-value>
    </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>

jsf/translator/build.xml

@@ -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" />

jsf/translator/ear/pom.xml

@@ -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,17 +58,17 @@
    </dependencies>
 
    <build>
-      <finalName>webbeans-translator</finalName>
+      <finalName>weld-translator</finalName>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-ear-plugin</artifactId>
             <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>

jsf/translator/ejb/pom.xml

@@ -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>

jsf/translator/war/pom.xml

@@ -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>

readme.txt

@@ -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 @@ Web Beans currently comes with a number of examples:
 * 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

se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java

@@ -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.

se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java

@@ -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;
 
 /**

se/numberguess/readme.txt

@@ -96,7 +96,7 @@ Running the Example
 -------------------
 
 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..

se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java

@@ -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.

wicket/gae/readme.txt

@@ -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
 
 

wicket/gae/war/WEB-INF/appengine-web.xml

@@ -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>
+</appengine-web-app>

wicket/gae/war/WEB-INF/web.xml

@@ -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>
 
 

wicket/numberguess/build.xml

@@ -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" />