[webbeans-commits] Webbeans SVN: r676 - in ri/tags: 1.0.0.ALPHA1 and 16 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Dec 22 06:39:23 EST 2008


Author: pete.muir at jboss.org
Date: 2008-12-22 06:39:21 -0500 (Mon, 22 Dec 2008)
New Revision: 676

Added:
   ri/tags/1.0.0.ALPHA1/
   ri/tags/1.0.0.ALPHA1/dist/
   ri/tags/1.0.0.ALPHA1/examples/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/WebContent/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml
   ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/numberguess/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/WebContent/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/src/
   ri/tags/1.0.0.ALPHA1/jboss-as/build.xml
   ri/tags/1.0.0.ALPHA1/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Observable.java
   ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtainable.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/src/
   ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
Removed:
   ri/tags/1.0.0.ALPHA1/dist/
   ri/tags/1.0.0.ALPHA1/examples/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/WebContent/
   ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml
   ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/numberguess/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/src/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/WebContent/
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml
   ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/src/
   ri/tags/1.0.0.ALPHA1/jboss-as/build.xml
   ri/tags/1.0.0.ALPHA1/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Fires.java
   ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtains.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/src/
   ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
   ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
Log:
[maven-release-plugin]  copy for tag 1.0.0.ALPHA1

Copied: ri/tags/1.0.0.ALPHA1 (from rev 666, ri/trunk)

Copied: ri/tags/1.0.0.ALPHA1/dist (from rev 668, ri/trunk/dist)

Copied: ri/tags/1.0.0.ALPHA1/examples (from rev 667, ri/trunk/examples)

Copied: ri/tags/1.0.0.ALPHA1/examples/numberguess (from rev 668, ri/trunk/examples/numberguess)

Copied: ri/tags/1.0.0.ALPHA1/examples/numberguess/WebContent (from rev 667, ri/trunk/examples/numberguess/WebContent)

Deleted: ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml
===================================================================
--- ri/trunk/examples/numberguess/build.xml	2008-12-22 11:15:39 UTC (rev 668)
+++ ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,7 +0,0 @@
-<project basedir="." name="Numberguess Example Build" default="restart">
-	
-	<property name="example.name" value="webbeans-numberguess" />
-
-	<import file="../build.xml" />
-	
-</project>
\ No newline at end of file

Copied: ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml (from rev 667, ri/trunk/examples/numberguess/build.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/examples/numberguess/build.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,7 @@
+<project basedir="." name="Numberguess Example Build" default="restart">
+	
+	<property name="example.name" value="webbeans-numberguess" />
+
+	<import file="../build.xml" />
+	
+</project>
\ No newline at end of file

Deleted: ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml
===================================================================
--- ri/trunk/examples/numberguess/pom.xml	2008-12-22 11:15:39 UTC (rev 668)
+++ ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,82 +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>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</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>webbeans-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>
-      </dependency>
-      
-      <!-- <dependency>
-         <groupId>org.jboss.el</groupId>
-         <artifactId>jboss-el</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>-->
-      
-      <dependency>
-         <groupId>javax.el</groupId>
-         <artifactId>el-ri</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      
-   </dependencies>
-   
-   <build>
-      <finalName>webbeans-numberguess</finalName>
-   </build>
-   
-</project>
-

Copied: ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml (from rev 667, ri/trunk/examples/numberguess/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/examples/numberguess/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,82 @@
+<?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>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</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>webbeans-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>
+      </dependency>
+      
+      <!-- <dependency>
+         <groupId>org.jboss.el</groupId>
+         <artifactId>jboss-el</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>-->
+      
+      <dependency>
+         <groupId>javax.el</groupId>
+         <artifactId>el-ri</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      
+   </dependencies>
+   
+   <build>
+      <finalName>webbeans-numberguess</finalName>
+   </build>
+   
+</project>
+

Copied: ri/tags/1.0.0.ALPHA1/examples/numberguess/src (from rev 667, ri/trunk/examples/numberguess/src)

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear (from rev 668, ri/trunk/examples/translator/webbeans-translator-ear)

Deleted: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ear/pom.xml	2008-12-22 11:15:39 UTC (rev 668)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,85 +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.translator</groupId>
-      <artifactId>parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-   
-   <groupId>org.jboss.webbeans.examples</groupId>
-   <artifactId>webbeans-translator-ear</artifactId>
-   <packaging>ear</packaging>
-   <name>Web Beans Examples: Translator (ear)</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.jboss.webbeans.examples.translator</groupId>
-         <artifactId>webbeans-translator-ejb</artifactId>
-         <type>ejb</type>
-      </dependency>
-      
-      <dependency>
-         <groupId>org.jboss.webbeans.examples.translator</groupId>
-         <artifactId>webbeans-translator-war</artifactId>
-         <type>war</type>
-      </dependency>
-   
-      <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <scope>test</scope>
-         <classifier>jdk15</classifier>
-      </dependency>
-      
-      <!-- <dependency>
-         <groupId>org.jboss.el</groupId>
-         <artifactId>jboss-el</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>-->
-      
-   </dependencies>
-   
-   <build>
-      <finalName>webbeans-translator</finalName>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-ear-plugin</artifactId>
-            <configuration>
-               <modules>
-                  <webModule>
-                     <groupId>org.jboss.webbeans.examples.translator</groupId>
-                     <artifactId>webbeans-translator-war</artifactId>
-                     <contextRoot>/webbeans-translator</contextRoot>
-                  </webModule>
-               </modules>
-               <jboss>
-                  <loader-repository>webbeans.jboss.org:loader=webbeans-translator</loader-repository>
-               </jboss>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-   
-</project>
-

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml (from rev 667, ri/trunk/examples/translator/webbeans-translator-ear/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,85 @@
+<?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.translator</groupId>
+      <artifactId>parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   
+   <groupId>org.jboss.webbeans.examples</groupId>
+   <artifactId>webbeans-translator-ear</artifactId>
+   <packaging>ear</packaging>
+   <name>Web Beans Examples: Translator (ear)</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.jboss.webbeans.examples.translator</groupId>
+         <artifactId>webbeans-translator-ejb</artifactId>
+         <type>ejb</type>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.webbeans.examples.translator</groupId>
+         <artifactId>webbeans-translator-war</artifactId>
+         <type>war</type>
+      </dependency>
+   
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+         <classifier>jdk15</classifier>
+      </dependency>
+      
+      <!-- <dependency>
+         <groupId>org.jboss.el</groupId>
+         <artifactId>jboss-el</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>-->
+      
+   </dependencies>
+   
+   <build>
+      <finalName>webbeans-translator</finalName>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-ear-plugin</artifactId>
+            <configuration>
+               <modules>
+                  <webModule>
+                     <groupId>org.jboss.webbeans.examples.translator</groupId>
+                     <artifactId>webbeans-translator-war</artifactId>
+                     <contextRoot>/webbeans-translator</contextRoot>
+                  </webModule>
+               </modules>
+               <jboss>
+                  <loader-repository>webbeans.jboss.org:loader=webbeans-translator</loader-repository>
+               </jboss>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
+   
+</project>
+

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ear/src (from rev 667, ri/trunk/examples/translator/webbeans-translator-ear/src)

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb (from rev 668, ri/trunk/examples/translator/webbeans-translator-ejb)

Deleted: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ejb/pom.xml	2008-12-22 11:15:39 UTC (rev 668)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,55 +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.translator</groupId>
-      <artifactId>parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-   
-   <groupId>org.jboss.webbeans.examples.translator</groupId>
-   <artifactId>webbeans-translator-ejb</artifactId>
-   <packaging>ejb</packaging>
-   <name>Web Beans Examples: Translator (ejb)</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>webbeans-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      
-      <dependency>
-         <groupId>javax.ejb</groupId>
-         <artifactId>ejb-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      
-   </dependencies>
-   
-   <build>
-      <finalName>webbeans-translator</finalName>
-   </build>
-   
-</project>
-

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml (from rev 667, ri/trunk/examples/translator/webbeans-translator-ejb/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,55 @@
+<?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.translator</groupId>
+      <artifactId>parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   
+   <groupId>org.jboss.webbeans.examples.translator</groupId>
+   <artifactId>webbeans-translator-ejb</artifactId>
+   <packaging>ejb</packaging>
+   <name>Web Beans Examples: Translator (ejb)</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>webbeans-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      
+      <dependency>
+         <groupId>javax.ejb</groupId>
+         <artifactId>ejb-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      
+   </dependencies>
+   
+   <build>
+      <finalName>webbeans-translator</finalName>
+   </build>
+   
+</project>
+

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-ejb/src (from rev 667, ri/trunk/examples/translator/webbeans-translator-ejb/src)

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war (from rev 668, ri/trunk/examples/translator/webbeans-translator-war)

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/WebContent (from rev 667, ri/trunk/examples/translator/webbeans-translator-war/WebContent)

Deleted: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-war/pom.xml	2008-12-22 11:15:39 UTC (rev 668)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,76 +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.translator</groupId>
-      <artifactId>parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-   
-   <groupId>org.jboss.webbeans.examples.translator</groupId>
-   <artifactId>webbeans-translator-war</artifactId>
-   <packaging>war</packaging>
-   <name>Web Beans Examples: Translator (war)</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>javax.faces</groupId>
-         <artifactId>jsf-api</artifactId>
-         <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>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>-->
-      
-      <dependency>
-         <groupId>javax.el</groupId>
-         <artifactId>el-ri</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.el</groupId>
-               <artifactId>el-api</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      
-   </dependencies>
-   
-   <build>
-      <finalName>webbeans-translator</finalName>
-   </build>
-   
-</project>
-

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml (from rev 667, ri/trunk/examples/translator/webbeans-translator-war/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,76 @@
+<?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.translator</groupId>
+      <artifactId>parent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   
+   <groupId>org.jboss.webbeans.examples.translator</groupId>
+   <artifactId>webbeans-translator-war</artifactId>
+   <packaging>war</packaging>
+   <name>Web Beans Examples: Translator (war)</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>javax.faces</groupId>
+         <artifactId>jsf-api</artifactId>
+         <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>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>-->
+      
+      <dependency>
+         <groupId>javax.el</groupId>
+         <artifactId>el-ri</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      
+   </dependencies>
+   
+   <build>
+      <finalName>webbeans-translator</finalName>
+   </build>
+   
+</project>
+

Copied: ri/tags/1.0.0.ALPHA1/examples/translator/webbeans-translator-war/src (from rev 667, ri/trunk/examples/translator/webbeans-translator-war/src)

Deleted: ri/tags/1.0.0.ALPHA1/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/jboss-as/build.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
-	<path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
-	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-	
-	<property name="maven.dir" location="${basedir}/lib/maven" />
-
-	<property file="build.properties" />
-	
-	<target name="clean" description="Clean up after the JBoss updater">
-		<delete dir="target" failonerror="false"/>
-	</target>
-
-	<target name="update" depends="install-jboss-ejb3-update, install-webbeans.deployer" description="Update JBoss 5 for the Web Beans RI" />
-		
-	<target name="install-webbeans.deployer">
-
-		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
-
-		<delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
-		<delete dir="target/webbeans.deployer" failonerror="false"/>
-		
-		<mkdir dir="target/webbeans.deployer"/>
-
-		<artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
-			<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0-SNAPSHOT"/>
-			<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0-SNAPSHOT"/>
-			<dependency groupId="org.jboss.webbeans" artifactId="webbeans-ri" version="1.0.0-SNAPSHOT"/>
-			<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2">
-				 <snapshots updatePolicy="always" />
-			</remoteRepository>
-			<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
-		</artifact:dependencies>
-
-		<artifact:dependencies filesetId="google.collections.fileset">
-			<dependency groupId="com.google.collections" artifactId="google-collections" version="0.8"/>
-		</artifact:dependencies>
-
-		<copy todir="target/webbeans.deployer">
-			<fileset refid="jboss5.deployer.fileset"/>
-			<chainedmapper>
-			   <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss5.deployer.versions}" to="flatten" />
-			   <flattenmapper />
-			</chainedmapper>
-		</copy>
-
-		<mkdir dir="target/webbeans.deployer/META-INF" />
-
-		<copy todir="target/webbeans.deployer/META-INF">
-			<fileset dir="${basedir}/resources">
-				<include name="webbeans-deployers-jboss-beans.xml"/>
-				<include name="jboss-structure.xml"/>
-			</fileset>
-		</copy>
-		
-		<mkdir dir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int" />
-		
-		<copy todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int">
-         <fileset dir="target/webbeans.deployer">
-            <include name="webbeans-ri.jar" />
-         </fileset>
-      </copy>
-
-		<copy todir="${jboss.home}/server/default/deployers/webbeans.deployer">
-			<fileset dir="target/webbeans.deployer">
-				<include name="**/*.xml" />
-				<include name="webbeans-ri-int-microcontainer.jar" />
-				<include name="webbeans-ri-int-jbossas.jar" />
-				<include name="webbeans-api.jar" />
-				<include name="webbeans-ri-spi.jar" />
-				<include name="google*.jar" />
-			</fileset>
-		</copy>
-
-	</target>
-	
-	<target name="install-jboss-ejb3-update">
-		
-		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
-		
-		<artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
-   		<dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="1.0.0-Alpha1" classifier="installer"/>
-   		<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
-	   </artifact:dependencies>
-		
-		<mkdir dir="target/ejb3.plugin"/>
-	   <copy todir="target/ejb3.plugin">
-         <fileset refid="jboss.ejb3.plugin.fileset"/>
-	   	<chainedmapper>
-	   		<flattenmapper />
-	   		<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
-	   	</chainedmapper>
-	   </copy>
-		<java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true">
-			<arg line="${jboss.home}" />
-		</java>
-	</target>
-
-	<macrodef name="maven">
-		<attribute name="target" />
-		<attribute name="basedir" />
-		<element name="args" implicit="true" optional="true" />
-		<sequential>
-			<java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
-				<classpath>
-					<fileset dir="${maven.dir}/boot">
-						<include name="*.jar" />
-					</fileset>
-					<fileset dir="${maven.dir}/bin">
-						<include name="*.*" />
-					</fileset>
-				</classpath>
-				<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
-				<sysproperty key="maven.home" value="${maven.dir}" />
-				<args />
-				<arg line="@{target}" />
-			</java>
-		</sequential>
-	</macrodef>
-
-</project>

Copied: ri/tags/1.0.0.ALPHA1/jboss-as/build.xml (from rev 670, ri/trunk/jboss-as/build.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/jboss-as/build.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/jboss-as/build.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<project name="JBoss5DeployerInstall" default="update" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+	<path id="maven-ant-tasks.classpath" path="../lib/maven-ant-tasks.jar" />
+	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+	
+	<property name="maven.dir" location="${basedir}/lib/maven" />
+
+	<property file="build.properties" />
+	
+	<target name="clean" description="Clean up after the JBoss updater">
+		<delete dir="target" failonerror="false"/>
+	</target>
+
+	<target name="update" depends="install-jboss-ejb3-update, install-webbeans.deployer" description="Update JBoss 5 for the Web Beans RI" />
+		
+	<target name="install-webbeans.deployer">
+
+		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+
+		<delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" />
+		<delete dir="target/webbeans.deployer" failonerror="false"/>
+		
+		<mkdir dir="target/webbeans.deployer"/>
+
+		<artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
+			<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0.ALPHA1"/>
+			<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0.ALPHA1"/>
+			<dependency groupId="org.jboss.webbeans" artifactId="webbeans-ri" version="1.0.0-SNAPSHOT"/>
+			<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2">
+				 <snapshots updatePolicy="always" />
+			</remoteRepository>
+			<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
+		</artifact:dependencies>
+
+		<artifact:dependencies filesetId="google.collections.fileset">
+			<dependency groupId="com.google.collections" artifactId="google-collections" version="0.8"/>
+		</artifact:dependencies>
+
+		<copy todir="target/webbeans.deployer">
+			<fileset refid="jboss5.deployer.fileset"/>
+			<chainedmapper>
+			   <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss5.deployer.versions}" to="flatten" />
+			   <flattenmapper />
+			</chainedmapper>
+		</copy>
+
+		<mkdir dir="target/webbeans.deployer/META-INF" />
+
+		<copy todir="target/webbeans.deployer/META-INF">
+			<fileset dir="${basedir}/resources">
+				<include name="webbeans-deployers-jboss-beans.xml"/>
+				<include name="jboss-structure.xml"/>
+			</fileset>
+		</copy>
+		
+		<mkdir dir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int" />
+		
+		<copy todir="${jboss.home}/server/default/deployers/webbeans.deployer/lib-int">
+         <fileset dir="target/webbeans.deployer">
+            <include name="webbeans-ri.jar" />
+         </fileset>
+      </copy>
+
+		<copy todir="${jboss.home}/server/default/deployers/webbeans.deployer">
+			<fileset dir="target/webbeans.deployer">
+				<include name="**/*.xml" />
+				<include name="webbeans-ri-int-microcontainer.jar" />
+				<include name="webbeans-ri-int-jbossas.jar" />
+				<include name="webbeans-api.jar" />
+				<include name="webbeans-ri-spi.jar" />
+				<include name="google*.jar" />
+			</fileset>
+		</copy>
+
+	</target>
+	
+	<target name="install-jboss-ejb3-update">
+		
+		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+		
+		<artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
+   		<dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="1.0.0-Alpha1" classifier="installer"/>
+   		<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
+	   </artifact:dependencies>
+		
+		<mkdir dir="target/ejb3.plugin"/>
+	   <copy todir="target/ejb3.plugin">
+         <fileset refid="jboss.ejb3.plugin.fileset"/>
+	   	<chainedmapper>
+	   		<flattenmapper />
+	   		<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
+	   	</chainedmapper>
+	   </copy>
+		<java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true">
+			<arg line="${jboss.home}" />
+		</java>
+	</target>
+
+	<macrodef name="maven">
+		<attribute name="target" />
+		<attribute name="basedir" />
+		<element name="args" implicit="true" optional="true" />
+		<sequential>
+			<java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
+				<classpath>
+					<fileset dir="${maven.dir}/boot">
+						<include name="*.jar" />
+					</fileset>
+					<fileset dir="${maven.dir}/bin">
+						<include name="*.*" />
+					</fileset>
+				</classpath>
+				<sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+				<sysproperty key="maven.home" value="${maven.dir}" />
+				<args />
+				<arg line="@{target}" />
+			</java>
+		</sequential>
+	</macrodef>
+
+</project>

Deleted: ri/tags/1.0.0.ALPHA1/pom.xml
===================================================================
--- ri/trunk/pom.xml	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>parent</artifactId>
-   <packaging>pom</packaging>
-   <version>1.0.0-SNAPSHOT</version>
-   <name>Web Beans</name>
-   <url>http://www.seamframework.org/WebBeans</url>
-
-   <description>
-      The reference implementation of JSR 299: Web Beans
-   </description>
-
-   <developers>
-      <developer>
-         <name>Pete Muir</name>
-         <roles>
-            <role>Project Lead</role>
-         </roles>
-         <email>pete.muir at jboss.org</email>
-         <organization>JBoss, a division of Red Hat</organization>
-         <url>http://in.relation.to/Bloggers/Pete</url>
-      </developer>
-
-      <developer>
-         <name>Shane Bryzak</name>
-         <organization>JBoss, a division of Red Hat</organization>
-      </developer>
-
-      <developer>
-         <name>David Allen</name>
-      </developer>
-      
-      <developer>
-         <name>Nicklas Karlsson</name>
-      </developer>
-   </developers>
-
-   <repositories>
-      <repository>
-         <id>repository.jboss.org</id>
-         <name>JBoss Repository</name>
-         <url>http://repository.jboss.org/maven2</url>
-      </repository>
-   </repositories>
-
-   <pluginRepositories>
-      <pluginRepository>
-         <id>repository.jboss.org</id>
-         <name>JBoss Repository</name>
-         <url>http://repository.jboss.org/maven2</url>
-      </pluginRepository>
-   </pluginRepositories>
-
-   <modules>
-      <module>webbeans-api</module>
-      <module>webbeans-ri</module>
-      <module>webbeans-ri-spi</module>
-   </modules>
-
-   <dependencyManagement>
-      <dependencies>
-
-         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.8</version>
-            <classifier>jdk15</classifier>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.ejb</groupId>
-            <artifactId>ejb-api</artifactId>
-            <version>3.0</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-         </dependency>
-
-         <dependency>
-            <groupId>org.scannotation</groupId>
-            <artifactId>scannotation</artifactId>
-            <version>1.0.2</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.8.1.GA</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.0.1B</version>
-         </dependency>
-
-         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>1.2</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-            <version>1.2_10</version>
-         </dependency>
-
-         <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>0.8</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>org.jboss.ejb3</groupId>
-            <artifactId>jboss-ejb3-embedded</artifactId>
-            <version>1.0.0-Alpha1</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>org.jboss.el</groupId>
-            <artifactId>jboss-el</artifactId>
-            <version>1.0_02.CR2</version>
-         </dependency>
-
-         <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.15.B1</version>
-         </dependency>
-
-         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-ri</artifactId>
-            <version>1.2</version>
-         </dependency>
-
-         <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-api</artifactId>
-            <version>${webbeans.version}</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-ri</artifactId>
-            <version>${webbeans.version}</version>
-         </dependency>
-         
-         <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-ri-spi</artifactId>
-            <version>${webbeans.version}</version>
-         </dependency>
-
-      </dependencies>
-   </dependencyManagement>
-
-   <build>
-      <extensions>
-         <extension>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-webdav</artifactId>
-            <version>1.0-beta-2</version>
-         </extension>
-      </extensions>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <phase>verify</phase>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
-      <pluginManagement>
-         <plugins>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <version>2.0.2</version>
-               <configuration>
-                  <source>1.5</source>
-                  <target>1.5</target>
-               </configuration>
-            </plugin>
-            <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>cobertura-maven-plugin</artifactId>
-               <version>2.2</version>
-            </plugin>
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                  <archive>
-                     <manifest>
-                        <addDefaultImplementationEntries>
-                           true
-                        </addDefaultImplementationEntries>
-                        <addDefaultSpecificationEntries>
-                           true
-                        </addDefaultSpecificationEntries>
-                     </manifest>
-                  </archive>
-               </configuration>
-            </plugin>
-         </plugins>
-      </pluginManagement>
-   </build>
-   
-   <profiles>
-      <profile>
-         <id>coverage</id>
-         <activation>
-            <property>
-               <name>coverage</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>emma-maven-plugin</artifactId>
-                  <version>1.0-alpha-1</version>
-                  <inherited>true</inherited>
-                  <executions>
-                     <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                           <goal>instrument</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <inherited>true</inherited>
-                  <configuration>
-                     <forkMode>once</forkMode>
-                     <reportFormat>xml</reportFormat>
-                     <classesDirectory>
-                        ${project.build.directory}/generated-classes/emma/classes
-                     </classesDirectory>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
-   
-   <ciManagement>
-      <system>Hudson</system>
-      <url></url>
-   </ciManagement>
-
-   <issueManagement>
-      <system>JIRA</system>
-      <url>http://jira.jboss.org/browse/WBRI</url>
-   </issueManagement>
-
-   <inceptionYear>2008</inceptionYear>
-
-   <licenses>
-      <license>
-         <name>Apache License, Version 2.0</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      </license>
-   </licenses>
-
-   <scm>
-      <connection>http://anonsvn.jboss.org/repos/webbeans</connection>
-      <developerConnection>
-         https://svn.jboss.org/repos/webbeans
-      </developerConnection>
-      <url>http://fisheye.jboss.org/browse/WebBeans</url>
-   </scm>
-
-   <distributionManagement>
-      <repository>
-         <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
-         <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
-         <!-- todo : replace this with direct svn access once the svnkit providers are available -->
-         <id>repository.jboss.org</id>
-         <url>file://${maven.repository.root}</url>
-      </repository>
-      <snapshotRepository>
-         <id>snapshots.jboss.org</id>
-         <name>JBoss Snapshot Repository</name>
-         <url>dav:https://snapshots.jboss.org/maven2</url>
-      </snapshotRepository>
-   </distributionManagement>
-
-   <reporting>
-      <plugins>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <configuration>
-               <formats>
-                  <format>html</format>
-                  <format>xml</format>
-               </formats>
-               <instrumentation>
-                  <ignores>
-                     <ignore>javax.webbeans.*</ignore>
-                  </ignores>
-               </instrumentation>
-            </configuration>
-         </plugin>
-      </plugins>
-   </reporting>
-   
-   <properties>
-      <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
-   </properties>
-
-</project>

Copied: ri/tags/1.0.0.ALPHA1/pom.xml (from rev 675, ri/trunk/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,379 @@
+<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>
+   <groupId>org.jboss.webbeans</groupId>
+   <artifactId>parent</artifactId>
+   <packaging>pom</packaging>
+   <version>1.0.0.ALPHA1</version>
+
+   <name>Web Beans</name>
+   <url>http://www.seamframework.org/WebBeans</url>
+
+   <description>
+      The reference implementation of JSR 299: Web Beans
+   </description>
+
+   <developers>
+      <developer>
+
+         <name>Pete Muir</name>
+         <roles>
+            <role>Project Lead</role>
+         </roles>
+         <email>pete.muir at jboss.org</email>
+         <organization>JBoss, a division of Red Hat</organization>
+         <url>http://in.relation.to/Bloggers/Pete</url>
+
+      </developer>
+
+      <developer>
+         <name>Shane Bryzak</name>
+         <organization>JBoss, a division of Red Hat</organization>
+      </developer>
+
+      <developer>
+         <name>David Allen</name>
+
+      </developer>
+      
+      <developer>
+         <name>Nicklas Karlsson</name>
+      </developer>
+   </developers>
+
+   <repositories>
+      <repository>
+         <id>repository.jboss.org</id>
+
+         <name>JBoss Repository</name>
+         <url>http://repository.jboss.org/maven2</url>
+      </repository>
+   </repositories>
+
+   <pluginRepositories>
+      <pluginRepository>
+         <id>repository.jboss.org</id>
+
+         <name>JBoss Repository</name>
+         <url>http://repository.jboss.org/maven2</url>
+      </pluginRepository>
+   </pluginRepositories>
+
+   <modules>
+      <module>webbeans-api</module>
+      <module>webbeans-ri</module>
+
+      <module>webbeans-ri-spi</module>
+   </modules>
+
+   <dependencyManagement>
+      <dependencies>
+
+         <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+
+            <version>5.8</version>
+            <classifier>jdk15</classifier>
+         </dependency>
+
+         <dependency>
+            <groupId>javax.ejb</groupId>
+            <artifactId>ejb-api</artifactId>
+
+            <version>3.0</version>
+         </dependency>
+
+         <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+
+         </dependency>
+
+         <dependency>
+            <groupId>org.scannotation</groupId>
+            <artifactId>scannotation</artifactId>
+            <version>1.0.2</version>
+         </dependency>
+
+         <dependency>
+            <groupId>javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.8.1.GA</version>
+         </dependency>
+
+         <dependency>
+            <groupId>javax.servlet</groupId>
+
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+         </dependency>
+
+         <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+
+            <version>1.0.1B</version>
+         </dependency>
+
+         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+
+         </dependency>
+
+         <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>el-api</artifactId>
+            <version>1.2</version>
+         </dependency>
+         
+         <dependency>
+
+            <groupId>javax.faces</groupId>
+            <artifactId>jsf-api</artifactId>
+            <version>1.2_10</version>
+         </dependency>
+
+         <dependency>
+            <groupId>com.google.collections</groupId>
+
+            <artifactId>google-collections</artifactId>
+            <version>0.8</version>
+         </dependency>
+         
+         <dependency>
+            <groupId>org.jboss.ejb3</groupId>
+            <artifactId>jboss-ejb3-embedded</artifactId>
+            <version>1.0.0-Alpha1</version>
+
+         </dependency>
+         
+         <dependency>
+            <groupId>org.jboss.el</groupId>
+            <artifactId>jboss-el</artifactId>
+            <version>1.0_02.CR2</version>
+         </dependency>
+
+         <dependency>
+
+            <groupId>com.sun.facelets</groupId>
+            <artifactId>jsf-facelets</artifactId>
+            <version>1.1.15.B1</version>
+         </dependency>
+
+         <dependency>
+            <groupId>javax.el</groupId>
+
+            <artifactId>el-ri</artifactId>
+            <version>1.2</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.jboss.webbeans</groupId>
+            <artifactId>webbeans-api</artifactId>
+
+            <version>${webbeans.version}</version>
+         </dependency>
+         
+         <dependency>
+            <groupId>org.jboss.webbeans</groupId>
+            <artifactId>webbeans-ri</artifactId>
+            <version>${webbeans.version}</version>
+         </dependency>
+
+         
+         <dependency>
+            <groupId>org.jboss.webbeans</groupId>
+            <artifactId>webbeans-ri-spi</artifactId>
+            <version>${webbeans.version}</version>
+         </dependency>
+
+      </dependencies>
+   </dependencyManagement>
+
+   <build>
+      <extensions>
+         <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav</artifactId>
+            <version>1.0-beta-2</version>
+         </extension>
+
+      </extensions>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>attach-sources</id>
+
+                  <phase>verify</phase>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <version>2.0.2</version>
+               <configuration>
+
+                  <source>1.5</source>
+                  <target>1.5</target>
+               </configuration>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>cobertura-maven-plugin</artifactId>
+
+               <version>2.2</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-jar-plugin</artifactId>
+               <configuration>
+                  <archive>
+
+                     <manifest>
+                        <addDefaultImplementationEntries>
+                           true
+                        </addDefaultImplementationEntries>
+                        <addDefaultSpecificationEntries>
+                           true
+                        </addDefaultSpecificationEntries>
+                     </manifest>
+                  </archive>
+               </configuration>
+
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
+   
+   <profiles>
+      <profile>
+         <id>coverage</id>
+         <activation>
+
+            <property>
+               <name>coverage</name>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+
+                  <artifactId>emma-maven-plugin</artifactId>
+                  <version>1.0-alpha-1</version>
+                  <inherited>true</inherited>
+                  <executions>
+                     <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+
+                           <goal>instrument</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+
+                  <inherited>true</inherited>
+                  <configuration>
+                     <forkMode>once</forkMode>
+                     <reportFormat>xml</reportFormat>
+                     <classesDirectory>
+                        ${project.build.directory}/generated-classes/emma/classes
+                     </classesDirectory>
+                  </configuration>
+
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+   
+   <ciManagement>
+      <system>Hudson</system>
+      <url />
+
+   </ciManagement>
+
+   <issueManagement>
+      <system>JIRA</system>
+      <url>http://jira.jboss.org/browse/WBRI</url>
+   </issueManagement>
+
+   <inceptionYear>2008</inceptionYear>
+
+   <licenses>
+      <license>
+         <name>Apache License, Version 2.0</name>
+         <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      </license>
+   </licenses>
+
+   <scm>
+
+      <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.ALPHA1</connection>
+      <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.ALPHA1</developerConnection>
+      <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.ALPHA1</url>
+   </scm>
+
+   <distributionManagement>
+      <repository>
+         <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+
+         <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+         <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+         <id>repository.jboss.org</id>
+         <url>file://${maven.repository.root}</url>
+      </repository>
+      <snapshotRepository>
+         <id>snapshots.jboss.org</id>
+
+         <name>JBoss Snapshot Repository</name>
+         <url>dav:https://snapshots.jboss.org/maven2</url>
+      </snapshotRepository>
+   </distributionManagement>
+
+   <reporting>
+      <plugins>
+         <plugin>
+
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <configuration>
+               <formats>
+                  <format>html</format>
+                  <format>xml</format>
+               </formats>
+
+               <instrumentation>
+                  <ignores>
+                     <ignore>javax.webbeans.*</ignore>
+                  </ignores>
+               </instrumentation>
+            </configuration>
+         </plugin>
+      </plugins>
+
+   </reporting>
+   
+   <properties>
+      <webbeans.version>1.0.0.ALPHA1</webbeans.version>
+   </properties>
+
+</project>
\ No newline at end of file

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml
===================================================================
--- ri/trunk/webbeans-api/pom.xml	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<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</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.jboss.webbeans</groupId>
-	<artifactId>webbeans-api</artifactId>
-	<packaging>jar</packaging>
-	<name>Web Beans API</name>
-	<url>http://www.seamframework.org/WebBeans</url>
-
-
-</project>

Copied: ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml (from rev 675, ri/trunk/webbeans-api/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,17 @@
+<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</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0.ALPHA1</version>
+	</parent>
+
+	<groupId>org.jboss.webbeans</groupId>
+	<artifactId>webbeans-api</artifactId>
+	<packaging>jar</packaging>
+	<name>Web Beans API</name>
+	<url>http://www.seamframework.org/WebBeans</url>
+
+
+</project>
\ No newline at end of file

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Fires.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Fires.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Fires.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,  
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a variable to be injected with an Event object that can be fired and 
- * observed by observer methods
- * 
- * @author David Allen
- * @author Gavin King
- */
-
- at BindingType
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
-public @interface Fires
-{
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Observable.java (from rev 667, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Observable.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Observable.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Observable.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,  
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a variable to be injected with an Event object that can be fired and 
+ * observed by observer methods
+ * 
+ * @author David Allen
+ * @author Gavin King
+ */
+
+ at BindingType
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+public @interface Observable
+{
+}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtainable.java (from rev 667, ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtainable.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtainable.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtainable.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,  
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package javax.webbeans;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a variable to be injected with an Instance object.
+ * 
+ * @author Gavin King
+ */
+
+ at BindingType
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+public @interface Obtainable
+{
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtains.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Obtains.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-api/src/main/java/javax/webbeans/Obtains.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,  
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package javax.webbeans;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a variable to be injected with an Instance object.
- * 
- * @author Gavin King
- */
-
- at BindingType
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
-public @interface Obtains
-{
-}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,102 +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">
-   <parent>
-      <artifactId>parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-ri</artifactId>
-   <name>Web Beans RI</name>
-   <dependencies>
-
-      <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-api</artifactId>
-      </dependency>
-      
-      <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-ri-spi</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <scope>test</scope>
-         <classifier>jdk15</classifier>
-      </dependency>
-      
-      <!-- <dependency>
-         <groupId>org.jboss.ejb3</groupId>
-         <artifactId>jboss-ejb3-embedded</artifactId>
-         <scope>test</scope>
-      </dependency>-->
-
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.transaction</groupId>
-         <artifactId>jta</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.ejb</groupId>
-         <artifactId>ejb-api</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.annotation</groupId>
-         <artifactId>jsr250-api</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javassist</groupId>
-         <artifactId>javassist</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>javax.el</groupId>
-         <artifactId>el-api</artifactId>
-      </dependency>
-      
-      <dependency>
-         <groupId>javax.faces</groupId>
-         <artifactId>jsf-api</artifactId>
-      </dependency>
-      
-      <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-   	<defaultGoal>install</defaultGoal>
-   	<plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.4.2</version>
-            <configuration>
-               <suiteXmlFiles>
-                  <suiteXmlFile>testng.xml</suiteXmlFile>
-               </suiteXmlFiles>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-
-</project>
\ No newline at end of file

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml (from rev 675, ri/trunk/webbeans-ri/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,99 @@
+<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">
+   <parent>
+      <artifactId>parent</artifactId>
+      <groupId>org.jboss.webbeans</groupId>
+      <version>1.0.0.ALPHA1</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.jboss.webbeans</groupId>
+   <artifactId>webbeans-ri</artifactId>
+   <name>Web Beans RI</name>
+   <dependencies>
+
+      <dependency>
+         <groupId>org.jboss.webbeans</groupId>
+         <artifactId>webbeans-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.webbeans</groupId>
+         <artifactId>webbeans-ri-spi</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+         <classifier>jdk15</classifier>
+      </dependency>
+      
+      <!-- <dependency>
+         <groupId>org.jboss.ejb3</groupId>
+         <artifactId>jboss-ejb3-embedded</artifactId>
+         <scope>test</scope>
+      </dependency>-->
+
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.transaction</groupId>
+         <artifactId>jta</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.ejb</groupId>
+         <artifactId>ejb-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.annotation</groupId>
+         <artifactId>jsr250-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>javassist</groupId>
+         <artifactId>javassist</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>javax.el</groupId>
+         <artifactId>el-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>javax.faces</groupId>
+         <artifactId>jsf-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>com.google.collections</groupId>
+         <artifactId>google-collections</artifactId>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+   	<defaultGoal>install</defaultGoal>
+   	<plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.4.2</version>
+            <configuration>
+               <suiteXmlFiles>
+                  <suiteXmlFile>testng.xml</suiteXmlFile>
+               </suiteXmlFiles>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>
\ No newline at end of file

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,379 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.webbeans.bootstrap;
-
-import static org.jboss.webbeans.bean.BeanFactory.createEnterpriseBean;
-import static org.jboss.webbeans.bean.BeanFactory.createEventBean;
-import static org.jboss.webbeans.bean.BeanFactory.createInstanceBean;
-import static org.jboss.webbeans.bean.BeanFactory.createObserver;
-import static org.jboss.webbeans.bean.BeanFactory.createProducerFieldBean;
-import static org.jboss.webbeans.bean.BeanFactory.createProducerMethodBean;
-import static org.jboss.webbeans.bean.BeanFactory.createSimpleBean;
-import static org.jboss.webbeans.ejb.EJB.ENTERPRISE_BEAN_CLASS;
-import static org.jboss.webbeans.jsf.JSF.UICOMPONENT_CLASS;
-import static org.jboss.webbeans.servlet.Servlet.FILTER_CLASS;
-import static org.jboss.webbeans.servlet.Servlet.HTTP_SESSION_LISTENER_CLASS;
-import static org.jboss.webbeans.servlet.Servlet.SERVLET_CLASS;
-import static org.jboss.webbeans.servlet.Servlet.SERVLET_CONTEXT_LISTENER_CLASS;
-import static org.jboss.webbeans.servlet.Servlet.SERVLET_REQUEST_LISTENER_CLASS;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-import javax.webbeans.Observes;
-import javax.webbeans.Obtains;
-
-import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.bean.AbstractBean;
-import org.jboss.webbeans.bean.AbstractClassBean;
-import org.jboss.webbeans.bean.BeanFactory;
-import org.jboss.webbeans.bean.EventBean;
-import org.jboss.webbeans.bean.InstanceBean;
-import org.jboss.webbeans.bean.ProducerFieldBean;
-import org.jboss.webbeans.bean.ProducerMethodBean;
-import org.jboss.webbeans.bindings.InitializedBinding;
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.contexts.DependentContext;
-import org.jboss.webbeans.event.ObserverImpl;
-import org.jboss.webbeans.introspector.AnnotatedField;
-import org.jboss.webbeans.introspector.AnnotatedItem;
-import org.jboss.webbeans.introspector.AnnotatedMethod;
-import org.jboss.webbeans.introspector.AnnotatedParameter;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.transaction.Transaction;
-import org.jboss.webbeans.util.JNDI;
-import org.jboss.webbeans.util.Reflections;
-
-/**
- * Bootstrapping functionality that is run at application startup and detects
- * and register beans
- * 
- * @author Pete Muir
- */
-public class WebBeansBootstrap
-{
-   // The property name of the discovery class
-   public static String WEB_BEAN_DISCOVERY_PROPERTY_NAME = "org.jboss.webbeans.bootstrap.webBeanDiscovery";
-   // The log provider
-   private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
-   // The Web Beans manager
-   protected ManagerImpl manager;
-
-   /**
-    * Constructor
-    * 
-    * Starts up with the singleton Manager
-    */
-   public WebBeansBootstrap(ManagerImpl manager)
-   {
-      this.manager = manager;
-      registerManager();
-      manager.addContext(DependentContext.INSTANCE);
-   }
-   
-   protected void registerManager()
-   {
-      JNDI.bind(ManagerImpl.JNDI_KEY, manager);
-      CurrentManager.setRootManager(manager);
-   }
-   
-   public WebBeansBootstrap()
-   {
-      this(new ManagerImpl());
-   }
-
-   /**
-    * Register any beans defined by the provided classes with the manager
-    * 
-    * @param classes The classes to register
-    */
-   protected void registerBeans(Class<?>... classes)
-   {
-      registerBeans(new HashSet<Class<?>>(Arrays.asList(classes)));
-   }
-
-   /**
-    * Register the bean with the manager, including any standard (built in) beans
-    * 
-    * @param classes The classes to register as Web Beans
-    */
-   protected void registerBeans(Iterable<Class<?>> classes)
-   {
-      Set<AbstractBean<?, ?>> beans = createBeans(classes);
-      beans.addAll(createStandardBeans());
-      manager.setBeans(beans);
-   }
-   
-   /**
-    * Creates the standard beans used internally by the RI
-    * 
-    * @return A set containing the created beans
-    */
-   protected Set<AbstractBean<?, ?>> createStandardBeans()
-   {
-      Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
-      createBean(BeanFactory.createSimpleBean(Transaction.class, manager), beans);
-      createBean(BeanFactory.createSimpleBean(ManagerImpl.class, manager), beans);
-      return beans;
-   }
-
-   /**
-    * Creates Web Beans from a set of classes
-    * 
-    * Iterates over the classes and creates a Web Bean of the corresponding
-    * type. Also register the beans injection points with the resolver. If the
-    * bean has producer methods, producer beans are created for these and those
-    * injection points are also registered.
-    * 
-    * @param classes The classes to adapt
-    * @return A set of adapted Web Beans
-    */
-   protected Set<AbstractBean<?, ?>> createBeans(Iterable<Class<?>> classes)
-   {
-      Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
-      for (Class<?> clazz : classes)
-      {
-         if (manager.getEjbDescriptorCache().containsKey(clazz))
-         {
-            createBean(createEnterpriseBean(clazz, manager), beans);
-         }
-         else if (isTypeSimpleWebBean(clazz))
-         {
-            createBean(createSimpleBean(clazz, manager), beans);
-         }
-      }
-      return beans;
-   }
-   
-   /**
-    * Creates a Web Bean from a bean abstraction and adds it to the set of created beans
-    * 
-    * Also creates the implicit field- and method-level beans, if present
-    * 
-    * @param bean The bean representation
-    * @param beans The set of created beans
-    */
-   @SuppressWarnings("unchecked")
-   protected void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> beans)
-   {
-      beans.add(bean);
-      manager.getResolver().addInjectionPoints(bean.getInjectionPoints());
-      for (AnnotatedMethod<Object> producerMethod : bean.getProducerMethods())
-      {
-         ProducerMethodBean<?> producerMethodBean = createProducerMethodBean(producerMethod, bean, manager);
-         beans.add(producerMethodBean);
-         manager.getResolver().addInjectionPoints(producerMethodBean.getInjectionPoints());
-         registerEvents(producerMethodBean.getInjectionPoints(), beans);
-         log.info("Web Bean: " + producerMethodBean);
-      }
-      for (AnnotatedField<Object> producerField : bean.getProducerFields())
-      {
-         ProducerFieldBean<?> producerFieldBean = createProducerFieldBean(producerField, bean, manager);
-         beans.add(producerFieldBean);
-         log.info("Web Bean: " + producerFieldBean);
-      }
-      for (AnnotatedMethod<Object> initializerMethod : bean.getInitializerMethods())
-      {
-         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Fires.class))
-         {
-            registerEvent(parameter, beans);
-         }
-      }
-      for (AnnotatedItem injectionPoint : bean.getInjectionPoints())
-      {
-         if ( injectionPoint.isAnnotationPresent(Fires.class) )  
-         {
-            registerEvent(injectionPoint, beans);
-         }
-         if ( injectionPoint.isAnnotationPresent(Obtains.class) )  
-         {
-            InstanceBean<Object, Field> instanceBean = createInstanceBean(injectionPoint, manager);
-            beans.add(instanceBean);
-            log.info("Web Bean: " + instanceBean);
-         }
-      }
-      for (AnnotatedMethod<Object> observerMethod : bean.getObserverMethods())
-      {
-         ObserverImpl<?> observer = createObserver(observerMethod, bean, manager);
-         if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1)
-         {
-            registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray());
-         }
-         else
-         {
-            throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer);
-         }
-         
-      }
-      log.info("Web Bean: " + bean);
-   }
-
-
-   /**
-    * Starts the boot process.
-    * 
-    * Discovers the beans and registers them with the manager. Also resolves the
-    * injection points.
-    * 
-    * @param webBeanDiscovery The discovery implementation
-    */
-   public synchronized void boot(WebBeanDiscovery webBeanDiscovery)
-   {
-      log.info("Starting Web Beans RI " + getVersion());
-      if (webBeanDiscovery == null)
-      {
-         throw new IllegalStateException("No WebBeanDiscovery provider found, you need to implement the org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery interface, and tell the RI to use it by specifying -D" + WebBeansBootstrap.WEB_BEAN_DISCOVERY_PROPERTY_NAME + "=<classname>");
-      }
-      // Must populate EJB cache first, as we need it to detect whether a bean is an EJB!
-      manager.getEjbDescriptorCache().addAll(webBeanDiscovery.discoverEjbs());
-      registerBeans(webBeanDiscovery.discoverWebBeanClasses());
-      log.info("Validing Web Bean injection points");
-      manager.getResolver().resolveInjectionPoints();
-      manager.fireEvent(manager, new InitializedBinding());
-      log.info("Web Beans RI initialized");
-   }
-
-   /**
-    * Gets version information
-    * 
-    * @return The implementation version from the Bootstrap class package.
-    */
-   public static String getVersion()
-   {
-      Package pkg = WebBeansBootstrap.class.getPackage();
-      return pkg != null ? pkg.getImplementationVersion() : null;
-   }
-
-   /**
-    * Gets the available discovery implementations
-    * 
-    * Parses the web-beans-ri.properties file and for each row describing a
-    * discover class, instantiate that class and add it to the set
-    * 
-    * @return A set of discovery implementations
-    * @see org.jboss.webbeans.bootstrap.DeploymentProperties
-    */
-   @SuppressWarnings("unchecked")
-   public static Set<Class<? extends WebBeanDiscovery>> getWebBeanDiscoveryClasses()
-   {
-      Set<Class<? extends WebBeanDiscovery>> webBeanDiscoveryClasses = new HashSet<Class<? extends WebBeanDiscovery>>();
-      for (String className : new DeploymentProperties(Thread.currentThread().getContextClassLoader()).getPropertyValues(WEB_BEAN_DISCOVERY_PROPERTY_NAME))
-      {
-         try
-         {
-            webBeanDiscoveryClasses.add((Class<WebBeanDiscovery>) Class.forName(className));
-         }
-         catch (ClassNotFoundException e)
-         {
-            log.debug("Unable to load WebBeanDiscovery provider " + className, e);
-         }
-         catch (NoClassDefFoundError e)
-         {
-            log.warn("Unable to load WebBeanDiscovery provider " + className + " due classDependencyProblem", e);
-         }
-      }
-      return webBeanDiscoveryClasses;
-   }
-
-   /**
-    * Registers an observer with the manager
-    * 
-    * @param observer The observer
-    * @param eventType The event type to observe
-    * @param bindings The binding types to observe on
-    */
-   @SuppressWarnings("unchecked")
-   private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings)
-   {
-      manager.addObserver(observer, (Class<T>) eventType, bindings);
-   }
-   
-   /**
-    * Iterates through the injection points and creates and registers any Event
-    * observables specified with the @Observable annotation
-    * 
-    * @param injectionPoints A set of injection points to inspect
-    * @param beans A set of beans to add the Event beans to
-    */
-   @SuppressWarnings("unchecked")
-   private void registerEvents(Set<AnnotatedItem<?,?>> injectionPoints, Set<AbstractBean<?, ?>> beans)
-   {
-      for (AnnotatedItem injectionPoint : injectionPoints)
-      {
-         registerEvent(injectionPoint, beans);
-      }
-   }
-   
-   @SuppressWarnings("unchecked")
-   private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
-   {
-      if ( injectionPoint.isAnnotationPresent(Fires.class) )
-      {
-         EventBean<Object, Method> eventBean = createEventBean(injectionPoint, manager);
-         beans.add(eventBean);
-         log.info("Web Bean: " + eventBean);
-      }      
-   }
-   /**
-    * Indicates if the type is a simple Web Bean
-    * 
-    * @param type The type to inspect
-    * @return True if simple Web Bean, false otherwise
-    */
-   protected static boolean isTypeSimpleWebBean(Class<?> type)
-   {
-      //TODO: check 3.2.1 for more rules!!!!!!
-      return !type.isAnnotation() && 
-      	    !Reflections.isAbstract(type) && 
-      	    !SERVLET_CLASS.isAssignableFrom(type) && 
-      	    !FILTER_CLASS.isAssignableFrom(type) && 
-      	    !SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && 
-      	    !HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && 
-      	    !SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && 
-      	    !ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && 
-      	    !UICOMPONENT_CLASS.isAssignableFrom(type) &&
-      	    hasSimpleWebBeanConstructor(type);
-   }
-
-   private static boolean hasSimpleWebBeanConstructor(Class<?> type) {
-      try {
-         type.getDeclaredConstructor();
-         return true;
-      }
-      catch (NoSuchMethodException nsme)
-      {
-         for (Constructor<?> c: type.getDeclaredConstructors())
-         {
-            if (c.isAnnotationPresent(Initializer.class)) return true;
-         }
-         return false;
-      }
-   }
-
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java (from rev 667, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,379 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.webbeans.bootstrap;
+
+import static org.jboss.webbeans.bean.BeanFactory.createEnterpriseBean;
+import static org.jboss.webbeans.bean.BeanFactory.createEventBean;
+import static org.jboss.webbeans.bean.BeanFactory.createInstanceBean;
+import static org.jboss.webbeans.bean.BeanFactory.createObserver;
+import static org.jboss.webbeans.bean.BeanFactory.createProducerFieldBean;
+import static org.jboss.webbeans.bean.BeanFactory.createProducerMethodBean;
+import static org.jboss.webbeans.bean.BeanFactory.createSimpleBean;
+import static org.jboss.webbeans.ejb.EJB.ENTERPRISE_BEAN_CLASS;
+import static org.jboss.webbeans.jsf.JSF.UICOMPONENT_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.FILTER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.HTTP_SESSION_LISTENER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_CONTEXT_LISTENER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_REQUEST_LISTENER_CLASS;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.webbeans.DefinitionException;
+import javax.webbeans.Initializer;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+import javax.webbeans.Observes;
+import javax.webbeans.Obtainable;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.bean.AbstractBean;
+import org.jboss.webbeans.bean.AbstractClassBean;
+import org.jboss.webbeans.bean.BeanFactory;
+import org.jboss.webbeans.bean.EventBean;
+import org.jboss.webbeans.bean.InstanceBean;
+import org.jboss.webbeans.bean.ProducerFieldBean;
+import org.jboss.webbeans.bean.ProducerMethodBean;
+import org.jboss.webbeans.bindings.InitializedBinding;
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.contexts.DependentContext;
+import org.jboss.webbeans.event.ObserverImpl;
+import org.jboss.webbeans.introspector.AnnotatedField;
+import org.jboss.webbeans.introspector.AnnotatedItem;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
+import org.jboss.webbeans.introspector.AnnotatedParameter;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.transaction.Transaction;
+import org.jboss.webbeans.util.JNDI;
+import org.jboss.webbeans.util.Reflections;
+
+/**
+ * Bootstrapping functionality that is run at application startup and detects
+ * and register beans
+ * 
+ * @author Pete Muir
+ */
+public class WebBeansBootstrap
+{
+   // The property name of the discovery class
+   public static String WEB_BEAN_DISCOVERY_PROPERTY_NAME = "org.jboss.webbeans.bootstrap.webBeanDiscovery";
+   // The log provider
+   private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
+   // The Web Beans manager
+   protected ManagerImpl manager;
+
+   /**
+    * Constructor
+    * 
+    * Starts up with the singleton Manager
+    */
+   public WebBeansBootstrap(ManagerImpl manager)
+   {
+      this.manager = manager;
+      registerManager();
+      manager.addContext(DependentContext.INSTANCE);
+   }
+   
+   protected void registerManager()
+   {
+      JNDI.bind(ManagerImpl.JNDI_KEY, manager);
+      CurrentManager.setRootManager(manager);
+   }
+   
+   public WebBeansBootstrap()
+   {
+      this(new ManagerImpl());
+   }
+
+   /**
+    * Register any beans defined by the provided classes with the manager
+    * 
+    * @param classes The classes to register
+    */
+   protected void registerBeans(Class<?>... classes)
+   {
+      registerBeans(new HashSet<Class<?>>(Arrays.asList(classes)));
+   }
+
+   /**
+    * Register the bean with the manager, including any standard (built in) beans
+    * 
+    * @param classes The classes to register as Web Beans
+    */
+   protected void registerBeans(Iterable<Class<?>> classes)
+   {
+      Set<AbstractBean<?, ?>> beans = createBeans(classes);
+      beans.addAll(createStandardBeans());
+      manager.setBeans(beans);
+   }
+   
+   /**
+    * Creates the standard beans used internally by the RI
+    * 
+    * @return A set containing the created beans
+    */
+   protected Set<AbstractBean<?, ?>> createStandardBeans()
+   {
+      Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
+      createBean(BeanFactory.createSimpleBean(Transaction.class, manager), beans);
+      createBean(BeanFactory.createSimpleBean(ManagerImpl.class, manager), beans);
+      return beans;
+   }
+
+   /**
+    * Creates Web Beans from a set of classes
+    * 
+    * Iterates over the classes and creates a Web Bean of the corresponding
+    * type. Also register the beans injection points with the resolver. If the
+    * bean has producer methods, producer beans are created for these and those
+    * injection points are also registered.
+    * 
+    * @param classes The classes to adapt
+    * @return A set of adapted Web Beans
+    */
+   protected Set<AbstractBean<?, ?>> createBeans(Iterable<Class<?>> classes)
+   {
+      Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
+      for (Class<?> clazz : classes)
+      {
+         if (manager.getEjbDescriptorCache().containsKey(clazz))
+         {
+            createBean(createEnterpriseBean(clazz, manager), beans);
+         }
+         else if (isTypeSimpleWebBean(clazz))
+         {
+            createBean(createSimpleBean(clazz, manager), beans);
+         }
+      }
+      return beans;
+   }
+   
+   /**
+    * Creates a Web Bean from a bean abstraction and adds it to the set of created beans
+    * 
+    * Also creates the implicit field- and method-level beans, if present
+    * 
+    * @param bean The bean representation
+    * @param beans The set of created beans
+    */
+   @SuppressWarnings("unchecked")
+   protected void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> beans)
+   {
+      beans.add(bean);
+      manager.getResolver().addInjectionPoints(bean.getInjectionPoints());
+      for (AnnotatedMethod<Object> producerMethod : bean.getProducerMethods())
+      {
+         ProducerMethodBean<?> producerMethodBean = createProducerMethodBean(producerMethod, bean, manager);
+         beans.add(producerMethodBean);
+         manager.getResolver().addInjectionPoints(producerMethodBean.getInjectionPoints());
+         registerEvents(producerMethodBean.getInjectionPoints(), beans);
+         log.info("Web Bean: " + producerMethodBean);
+      }
+      for (AnnotatedField<Object> producerField : bean.getProducerFields())
+      {
+         ProducerFieldBean<?> producerFieldBean = createProducerFieldBean(producerField, bean, manager);
+         beans.add(producerFieldBean);
+         log.info("Web Bean: " + producerFieldBean);
+      }
+      for (AnnotatedMethod<Object> initializerMethod : bean.getInitializerMethods())
+      {
+         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Observable.class))
+         {
+            registerEvent(parameter, beans);
+         }
+      }
+      for (AnnotatedItem injectionPoint : bean.getInjectionPoints())
+      {
+         if ( injectionPoint.isAnnotationPresent(Observable.class) )  
+         {
+            registerEvent(injectionPoint, beans);
+         }
+         if ( injectionPoint.isAnnotationPresent(Obtainable.class) )  
+         {
+            InstanceBean<Object, Field> instanceBean = createInstanceBean(injectionPoint, manager);
+            beans.add(instanceBean);
+            log.info("Web Bean: " + instanceBean);
+         }
+      }
+      for (AnnotatedMethod<Object> observerMethod : bean.getObserverMethods())
+      {
+         ObserverImpl<?> observer = createObserver(observerMethod, bean, manager);
+         if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1)
+         {
+            registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray());
+         }
+         else
+         {
+            throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer);
+         }
+         
+      }
+      log.info("Web Bean: " + bean);
+   }
+
+
+   /**
+    * Starts the boot process.
+    * 
+    * Discovers the beans and registers them with the manager. Also resolves the
+    * injection points.
+    * 
+    * @param webBeanDiscovery The discovery implementation
+    */
+   public synchronized void boot(WebBeanDiscovery webBeanDiscovery)
+   {
+      log.info("Starting Web Beans RI " + getVersion());
+      if (webBeanDiscovery == null)
+      {
+         throw new IllegalStateException("No WebBeanDiscovery provider found, you need to implement the org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery interface, and tell the RI to use it by specifying -D" + WebBeansBootstrap.WEB_BEAN_DISCOVERY_PROPERTY_NAME + "=<classname>");
+      }
+      // Must populate EJB cache first, as we need it to detect whether a bean is an EJB!
+      manager.getEjbDescriptorCache().addAll(webBeanDiscovery.discoverEjbs());
+      registerBeans(webBeanDiscovery.discoverWebBeanClasses());
+      log.info("Validing Web Bean injection points");
+      manager.getResolver().resolveInjectionPoints();
+      manager.fireEvent(manager, new InitializedBinding());
+      log.info("Web Beans RI initialized");
+   }
+
+   /**
+    * Gets version information
+    * 
+    * @return The implementation version from the Bootstrap class package.
+    */
+   public static String getVersion()
+   {
+      Package pkg = WebBeansBootstrap.class.getPackage();
+      return pkg != null ? pkg.getImplementationVersion() : null;
+   }
+
+   /**
+    * Gets the available discovery implementations
+    * 
+    * Parses the web-beans-ri.properties file and for each row describing a
+    * discover class, instantiate that class and add it to the set
+    * 
+    * @return A set of discovery implementations
+    * @see org.jboss.webbeans.bootstrap.DeploymentProperties
+    */
+   @SuppressWarnings("unchecked")
+   public static Set<Class<? extends WebBeanDiscovery>> getWebBeanDiscoveryClasses()
+   {
+      Set<Class<? extends WebBeanDiscovery>> webBeanDiscoveryClasses = new HashSet<Class<? extends WebBeanDiscovery>>();
+      for (String className : new DeploymentProperties(Thread.currentThread().getContextClassLoader()).getPropertyValues(WEB_BEAN_DISCOVERY_PROPERTY_NAME))
+      {
+         try
+         {
+            webBeanDiscoveryClasses.add((Class<WebBeanDiscovery>) Class.forName(className));
+         }
+         catch (ClassNotFoundException e)
+         {
+            log.debug("Unable to load WebBeanDiscovery provider " + className, e);
+         }
+         catch (NoClassDefFoundError e)
+         {
+            log.warn("Unable to load WebBeanDiscovery provider " + className + " due classDependencyProblem", e);
+         }
+      }
+      return webBeanDiscoveryClasses;
+   }
+
+   /**
+    * Registers an observer with the manager
+    * 
+    * @param observer The observer
+    * @param eventType The event type to observe
+    * @param bindings The binding types to observe on
+    */
+   @SuppressWarnings("unchecked")
+   private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings)
+   {
+      manager.addObserver(observer, (Class<T>) eventType, bindings);
+   }
+   
+   /**
+    * Iterates through the injection points and creates and registers any Event
+    * observables specified with the @Observable annotation
+    * 
+    * @param injectionPoints A set of injection points to inspect
+    * @param beans A set of beans to add the Event beans to
+    */
+   @SuppressWarnings("unchecked")
+   private void registerEvents(Set<AnnotatedItem<?,?>> injectionPoints, Set<AbstractBean<?, ?>> beans)
+   {
+      for (AnnotatedItem injectionPoint : injectionPoints)
+      {
+         registerEvent(injectionPoint, beans);
+      }
+   }
+   
+   @SuppressWarnings("unchecked")
+   private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
+   {
+      if ( injectionPoint.isAnnotationPresent(Observable.class) )
+      {
+         EventBean<Object, Method> eventBean = createEventBean(injectionPoint, manager);
+         beans.add(eventBean);
+         log.info("Web Bean: " + eventBean);
+      }      
+   }
+   /**
+    * Indicates if the type is a simple Web Bean
+    * 
+    * @param type The type to inspect
+    * @return True if simple Web Bean, false otherwise
+    */
+   protected static boolean isTypeSimpleWebBean(Class<?> type)
+   {
+      //TODO: check 3.2.1 for more rules!!!!!!
+      return !type.isAnnotation() && 
+      	    !Reflections.isAbstract(type) && 
+      	    !SERVLET_CLASS.isAssignableFrom(type) && 
+      	    !FILTER_CLASS.isAssignableFrom(type) && 
+      	    !SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && 
+      	    !UICOMPONENT_CLASS.isAssignableFrom(type) &&
+      	    hasSimpleWebBeanConstructor(type);
+   }
+
+   private static boolean hasSimpleWebBeanConstructor(Class<?> type) {
+      try {
+         type.getDeclaredConstructor();
+         return true;
+      }
+      catch (NoSuchMethodException nsme)
+      {
+         for (Constructor<?> c: type.getDeclaredConstructors())
+         {
+            if (c.isAnnotationPresent(Initializer.class)) return true;
+         }
+         return false;
+      }
+   }
+
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.webbeans.event;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-import javax.webbeans.manager.Manager;
-
-import org.jboss.webbeans.FacadeImpl;
-import org.jboss.webbeans.util.Strings;
-
-/**
- * Implementation of the Event interface
- * 
- * @author David Allen
- * 
- * @param <T> The type of event being wrapped
- * @see javax.webbeans.Event
- */
-public class EventImpl<T> extends FacadeImpl<T> implements Event<T>
-{
-   @SuppressWarnings("unchecked")
-   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Fires.class));
-
-   /**
-    * Constructor
-    * 
-    * @param eventType The event type
-    * @param manager The Web Beans manager
-    * @param bindingTypes The binding types
-    */
-   public EventImpl(Class<T> eventType, Manager manager, Annotation... bindingTypes)
-   {
-      super(eventType, manager, bindingTypes);
-   }
-
-   /**
-    * Fires an event
-    * 
-    * @param event The event object
-    * @param bindingTypes Additional binding types
-    */
-   public void fire(T event, Annotation... bindingTypes)
-   {
-      manager.fireEvent(event, mergeBindings(bindingTypes));
-   }
-
-   /**
-    * Registers an observer
-    * 
-    * @param observer
-    * @param bindingTypes Additional binding types
-    */
-   public void observe(Observer<T> observer, Annotation... bindingTypes)
-   {
-      manager.addObserver(observer, type, mergeBindings(bindingTypes));
-   }
-
-   @Override
-   public String toString()
-   {
-      StringBuilder buffer = new StringBuilder();
-      buffer.append("Observable Event:\n");
-      buffer.append("  Event Type: " + type.getName() + "\n");
-      buffer.append(Strings.collectionToString("  Event Bindings: ", bindingTypes));
-      return buffer.toString();
-   }
-
-   /**
-    * @see org.jboss.webbeans.FacadeImpl#getFilteredAnnotations
-    */
-   @Override
-   protected Set<Class<? extends Annotation>> getFilteredAnnotations()
-   {
-      return FILTERED_ANNOTATIONS;
-   }
-
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java (from rev 667, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.webbeans.event;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+import javax.webbeans.manager.Manager;
+
+import org.jboss.webbeans.FacadeImpl;
+import org.jboss.webbeans.util.Strings;
+
+/**
+ * Implementation of the Event interface
+ * 
+ * @author David Allen
+ * 
+ * @param <T> The type of event being wrapped
+ * @see javax.webbeans.Event
+ */
+public class EventImpl<T> extends FacadeImpl<T> implements Event<T>
+{
+   @SuppressWarnings("unchecked")
+   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Observable.class));
+
+   /**
+    * Constructor
+    * 
+    * @param eventType The event type
+    * @param manager The Web Beans manager
+    * @param bindingTypes The binding types
+    */
+   public EventImpl(Class<T> eventType, Manager manager, Annotation... bindingTypes)
+   {
+      super(eventType, manager, bindingTypes);
+   }
+
+   /**
+    * Fires an event
+    * 
+    * @param event The event object
+    * @param bindingTypes Additional binding types
+    */
+   public void fire(T event, Annotation... bindingTypes)
+   {
+      manager.fireEvent(event, mergeBindings(bindingTypes));
+   }
+
+   /**
+    * Registers an observer
+    * 
+    * @param observer
+    * @param bindingTypes Additional binding types
+    */
+   public void observe(Observer<T> observer, Annotation... bindingTypes)
+   {
+      manager.addObserver(observer, type, mergeBindings(bindingTypes));
+   }
+
+   @Override
+   public String toString()
+   {
+      StringBuilder buffer = new StringBuilder();
+      buffer.append("Observable Event:\n");
+      buffer.append("  Event Type: " + type.getName() + "\n");
+      buffer.append(Strings.collectionToString("  Event Bindings: ", bindingTypes));
+      return buffer.toString();
+   }
+
+   /**
+    * @see org.jboss.webbeans.FacadeImpl#getFilteredAnnotations
+    */
+   @Override
+   protected Set<Class<? extends Annotation>> getFilteredAnnotations()
+   {
+      return FILTERED_ANNOTATIONS;
+   }
+
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.webbeans.AfterTransactionCompletion;
-import javax.webbeans.AfterTransactionFailure;
-import javax.webbeans.AfterTransactionSuccess;
-import javax.webbeans.BeforeTransactionCompletion;
-import javax.webbeans.Disposes;
-import javax.webbeans.IfExists;
-import javax.webbeans.Fires;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Manager;
-
-/**
- * AnnotatedType provides a uniform access to the annotations on an annotated
- * class defined either in Java or XML
- * 
- * @author Pete Muir
- * 
- */
-public interface AnnotatedMethod<T> extends AnnotatedItem<T, Method>
-{
-   @SuppressWarnings("unchecked")
-   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Fires.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
-
-   /**
-    * Gets the abstracted parameters of the method
-    * 
-    * @return A list of parameters. Returns an empty list if no parameters are
-    *         present.
-    */
-   public List<AnnotatedParameter<Object>> getParameters();
-
-   /**
-    * Gets the list of annotated parameters for a given annotation
-    * 
-    * @param metaAnnotationType The annotation to match
-    * @return A set of matching parameter abstractions. Returns an empty list if
-    *         there are no matches.
-    */
-   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
-   
-   /**
-    * Get the parameter types as an array
-    */
-   public Class<?>[] getParameterTypesAsArray();
-
-   /**
-    * Invokes the method
-    * 
-    * @param instance The instance to invoke
-    * @param manager The Web Beans manager
-    * @return A reference to the instance
-    */
-   public T invoke(Object instance, Manager manager);
-   
-   /**
-    * Invokes the method on the class of the passed instance, not the declaring 
-    * class. Useful with proxies
-    * 
-    * @param instance The instance to invoke
-    * @param manager The Web Beans manager
-    * @return A reference to the instance
-    */
-   public T invokeOnInstance(Object instance, Manager manager);
-
-   /**
-    * Invokes the observer method
-    * 
-    * @param instance The instance to invoke
-    * @param event the event object
-    * @param manager The Web Beans manager
-    * @return A reference to the instance
-    */
-   public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, Manager manager);
-
-   /**
-    * Invokes the method
-    * 
-    * @param instance The instance to invoke
-    * @param parameters The method parameters
-    * @return A reference to the instance
-    */
-   public T invoke(Object instance, Object... parameters);
-
-   /**
-    * Gets the declaring class
-    * 
-    * @return An abstraction of the declaring class
-    */
-   public AnnotatedType<?> getDeclaringClass();
-
-   /**
-    * Gets the property name
-    * 
-    * @return The name
-    */
-   public String getPropertyName();
-
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java (from rev 667, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.webbeans.introspector;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.webbeans.AfterTransactionCompletion;
+import javax.webbeans.AfterTransactionFailure;
+import javax.webbeans.AfterTransactionSuccess;
+import javax.webbeans.BeforeTransactionCompletion;
+import javax.webbeans.Disposes;
+import javax.webbeans.IfExists;
+import javax.webbeans.Observable;
+import javax.webbeans.Observes;
+import javax.webbeans.manager.Manager;
+
+/**
+ * AnnotatedType provides a uniform access to the annotations on an annotated
+ * class defined either in Java or XML
+ * 
+ * @author Pete Muir
+ * 
+ */
+public interface AnnotatedMethod<T> extends AnnotatedItem<T, Method>
+{
+   @SuppressWarnings("unchecked")
+   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Observable.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
+
+   /**
+    * Gets the abstracted parameters of the method
+    * 
+    * @return A list of parameters. Returns an empty list if no parameters are
+    *         present.
+    */
+   public List<AnnotatedParameter<Object>> getParameters();
+
+   /**
+    * Gets the list of annotated parameters for a given annotation
+    * 
+    * @param metaAnnotationType The annotation to match
+    * @return A set of matching parameter abstractions. Returns an empty list if
+    *         there are no matches.
+    */
+   public List<AnnotatedParameter<Object>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType);
+   
+   /**
+    * Get the parameter types as an array
+    */
+   public Class<?>[] getParameterTypesAsArray();
+
+   /**
+    * Invokes the method
+    * 
+    * @param instance The instance to invoke
+    * @param manager The Web Beans manager
+    * @return A reference to the instance
+    */
+   public T invoke(Object instance, Manager manager);
+   
+   /**
+    * Invokes the method on the class of the passed instance, not the declaring 
+    * class. Useful with proxies
+    * 
+    * @param instance The instance to invoke
+    * @param manager The Web Beans manager
+    * @return A reference to the instance
+    */
+   public T invokeOnInstance(Object instance, Manager manager);
+
+   /**
+    * Invokes the observer method
+    * 
+    * @param instance The instance to invoke
+    * @param event the event object
+    * @param manager The Web Beans manager
+    * @return A reference to the instance
+    */
+   public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, Manager manager);
+
+   /**
+    * Invokes the method
+    * 
+    * @param instance The instance to invoke
+    * @param parameters The method parameters
+    * @return A reference to the instance
+    */
+   public T invoke(Object instance, Object... parameters);
+
+   /**
+    * Gets the declaring class
+    * 
+    * @return An abstraction of the declaring class
+    */
+   public AnnotatedType<?> getDeclaringClass();
+
+   /**
+    * Gets the property name
+    * 
+    * @return The name
+    */
+   public String getPropertyName();
+
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
-public class AuroraFinch
-{
-
-   private Mess someMess;
-
-   @Initializer
-   public AuroraFinch(@Fires Event<Mess> eventObject)
-   {
-      // Create a new mess and fire the event for it
-      someMess = new Mess();
-      eventObject.fire(someMess);
-   }
-
-   public Mess getSomeMess()
-   {
-      return someMess;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Event;
+import javax.webbeans.Initializer;
+import javax.webbeans.Observable;
+
+import org.jboss.webbeans.test.beans.StarFinch.Mess;
+
+public class AuroraFinch
+{
+
+   private Mess someMess;
+
+   @Initializer
+   public AuroraFinch(@Observable Event<Mess> eventObject)
+   {
+      // Create a new mess and fire the event for it
+      someMess = new Mess();
+      eventObject.fire(someMess);
+   }
+
+   public Mess getSomeMess()
+   {
+      return someMess;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-public class BlueFacedParrotFinch
-{
-   @Fires
-   private Event<String> simpleEvent;
-
-   public void methodThatFiresEvent()
-   {
-      simpleEvent.fire("An event");
-   }
-
-   public void methodThatRegistersObserver()
-   {
-      simpleEvent.observe(new Observer<String>()
-      {
-         public void notify(String event)
-         {
-         }
-      });
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+
+public class BlueFacedParrotFinch
+{
+   @Observable
+   private Event<String> simpleEvent;
+
+   public void methodThatFiresEvent()
+   {
+      simpleEvent.fire("An event");
+   }
+
+   public void methodThatRegistersObserver()
+   {
+      simpleEvent.observe(new Observer<String>()
+      {
+         public void notify(String event)
+         {
+         }
+      });
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.Destructor;
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
- at ConversationScoped @Stateful
-public class EuropeanGoldfinch
-{
-   private Mess someMess;
-
-   public Mess getSomeMess()
-   {
-      return someMess;
-   }
-
-   @Destructor @Remove
-   public void remove(@Fires Event<Mess> eventObject)
-   {
-      // Create a new mess and fire the event for it
-      someMess = new Mess();
-      eventObject.fire(someMess);
-   }
-
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,30 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.webbeans.ConversationScoped;
+import javax.webbeans.Destructor;
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+import org.jboss.webbeans.test.beans.StarFinch.Mess;
+
+ at ConversationScoped @Stateful
+public class EuropeanGoldfinch
+{
+   private Mess someMess;
+
+   public Mess getSomeMess()
+   {
+      return someMess;
+   }
+
+   @Destructor @Remove
+   public void remove(@Observable Event<Mess> eventObject)
+   {
+      // Create a new mess and fire the event for it
+      someMess = new Mess();
+      eventObject.fire(someMess);
+   }
+
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,32 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Initializer;
-import javax.webbeans.Fires;
-import javax.webbeans.RequestScoped;
-
-import org.jboss.webbeans.test.beans.StarFinch.Mess;
-
- at RequestScoped
-public class OrangeCheekedWaxbill
-{
-
-   private Mess someMess;
-
-   public OrangeCheekedWaxbill()
-   {
-   }
-
-   @Initializer
-   public void theInitializerMethod(@Fires Event<Mess> eventObject)
-   {
-      // Create a new mess and fire the event for it
-      someMess = new Mess();
-      eventObject.fire(someMess);
-   }
-
-   public Mess getSomeMess()
-   {
-      return someMess;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,32 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Event;
+import javax.webbeans.Initializer;
+import javax.webbeans.Observable;
+import javax.webbeans.RequestScoped;
+
+import org.jboss.webbeans.test.beans.StarFinch.Mess;
+
+ at RequestScoped
+public class OrangeCheekedWaxbill
+{
+
+   private Mess someMess;
+
+   public OrangeCheekedWaxbill()
+   {
+   }
+
+   @Initializer
+   public void theInitializerMethod(@Observable Event<Mess> eventObject)
+   {
+      // Create a new mess and fire the event for it
+      someMess = new Mess();
+      eventObject.fire(someMess);
+   }
+
+   public Mess getSomeMess()
+   {
+      return someMess;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.Event;
-import javax.webbeans.Named;
-import javax.webbeans.Fires;
-import javax.webbeans.Produces;
-import javax.webbeans.RequestScoped;
-
- at RequestScoped
- at Named("StarFinch")
-public class StarFinch
-{
-   public static class Mess
-   {
-   }
-
-   public StarFinch()
-   {
-   }
-
-   @Produces
-   public Mess producerOfMesses(@Fires Event<Mess> messEvent)
-   {
-      Mess newMess = new Mess();
-      messEvent.fire(newMess);
-      return newMess;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,28 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Event;
+import javax.webbeans.Named;
+import javax.webbeans.Observable;
+import javax.webbeans.Produces;
+import javax.webbeans.RequestScoped;
+
+ at RequestScoped
+ at Named("StarFinch")
+public class StarFinch
+{
+   public static class Mess
+   {
+   }
+
+   public StarFinch()
+   {
+   }
+
+   @Produces
+   public Mess producerOfMesses(@Observable Event<Mess> messEvent)
+   {
+      Mess newMess = new Mess();
+      messEvent.fire(newMess);
+      return newMess;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class BlackRumpedWaxbill
-{
-   @Fires
-   private Event simpleEvent;
-
-   public void eliminateWarning()
-   {
-      assert simpleEvent != null;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class BlackRumpedWaxbill
+{
+   @Observable
+   private Event simpleEvent;
+
+   public void eliminateWarning()
+   {
+      assert simpleEvent != null;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import java.util.ArrayList;
-
-import javax.webbeans.Fires;
-
-public class CommonWaxbill
-{
-   @Fires
-   private ArrayList<String> simpleEvent;
-
-   public void eliminateWarning()
-   {
-      assert simpleEvent != null;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import java.util.ArrayList;
+
+import javax.webbeans.Observable;
+
+public class CommonWaxbill
+{
+   @Observable
+   private ArrayList<String> simpleEvent;
+
+   public void eliminateWarning()
+   {
+      assert simpleEvent != null;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,15 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class GoldbreastWaxbill
-{
-   @Fires
-   private Event<?> simpleEvent;
-
-   public void eliminateWarning()
-   {
-      assert simpleEvent != null;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class GoldbreastWaxbill
+{
+   @Observable
+   private Event<?> simpleEvent;
+
+   public void eliminateWarning()
+   {
+      assert simpleEvent != null;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import java.util.ArrayList;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-public class JavaSparrow
-{
-   @Fires
-   private Event<ArrayList<String>> simpleEvent;
-
-   public void eliminateWarning()
-   {
-      assert simpleEvent != null;
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,17 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import java.util.ArrayList;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+
+public class JavaSparrow
+{
+   @Observable
+   private Event<ArrayList<String>> simpleEvent;
+
+   public void eliminateWarning()
+   {
+      assert simpleEvent != null;
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
-
-public class OwlFinch
-{
-   @Fires
-   private Event<String> simpleEvent;
-
-   public void methodThatFiresEvent()
-   {
-      simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral());
-   }
-
-   public void methodThatRegistersObserver()
-   {
-      simpleEvent.observe(new Observer<String>()
-      {
-         public void notify(String event)
-         {
-         }
-      }, new AnimalStereotypeAnnotationLiteral());
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,28 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+
+import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
+
+public class OwlFinch
+{
+   @Observable
+   private Event<String> simpleEvent;
+
+   public void methodThatFiresEvent()
+   {
+      simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral());
+   }
+
+   public void methodThatRegistersObserver()
+   {
+      simpleEvent.observe(new Observer<String>()
+      {
+         public void notify(String event)
+         {
+         }
+      }, new AnimalStereotypeAnnotationLiteral());
+   }
+}

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	2008-12-22 10:32:32 UTC (rev 666)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-import javax.webbeans.Observer;
-
-import org.jboss.webbeans.test.annotations.Role;
-import org.jboss.webbeans.test.bindings.RoleBinding;
-
-public class SweeWaxbill
-{
-   @Fires @Role("Admin")
-   private Event<String> simpleEvent;
-
-   public void methodThatFiresEvent()
-   {
-      simpleEvent.fire("An event", new RoleBinding("Admin"));
-   }
-
-   public void methodThatRegistersObserver()
-   {
-      simpleEvent.observe(new Observer<String>()
-      {
-
-         public void notify(String event)
-         {
-         }
-      }, new RoleBinding("Admin"));
-   }
-}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java (from rev 667, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,30 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+
+import org.jboss.webbeans.test.annotations.Role;
+import org.jboss.webbeans.test.bindings.RoleBinding;
+
+public class SweeWaxbill
+{
+   @Observable @Role("Admin")
+   private Event<String> simpleEvent;
+
+   public void methodThatFiresEvent()
+   {
+      simpleEvent.fire("An event", new RoleBinding("Admin"));
+   }
+
+   public void methodThatRegistersObserver()
+   {
+      simpleEvent.observe(new Observer<String>()
+      {
+
+         public void notify(String event)
+         {
+         }
+      }, new RoleBinding("Admin"));
+   }
+}

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri-spi (from rev 669, ri/trunk/webbeans-ri-spi)

Deleted: ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml
===================================================================
--- ri/trunk/webbeans-ri-spi/pom.xml	2008-12-22 11:16:47 UTC (rev 669)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -1,39 +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">
-   <parent>
-      <artifactId>parent</artifactId>
-      <groupId>org.jboss.webbeans</groupId>
-      <version>1.0.0-SNAPSHOT</version>
-   </parent>
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>org.jboss.webbeans</groupId>
-   <artifactId>webbeans-ri-spi</artifactId>
-   <name>Web Beans RI Service Provider Interfaces</name>
-   <dependencies>
-
-      <dependency>
-         <groupId>org.jboss.webbeans</groupId>
-         <artifactId>webbeans-api</artifactId>
-      </dependency>
-
-      <dependency>
-         <groupId>org.testng</groupId>
-         <artifactId>testng</artifactId>
-         <scope>test</scope>
-         <classifier>jdk15</classifier>
-      </dependency>
-      
-      <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-   	<defaultGoal>install</defaultGoal>
-   </build>
-
-</project>

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml (from rev 675, ri/trunk/webbeans-ri-spi/pom.xml)
===================================================================
--- ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml	                        (rev 0)
+++ ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/pom.xml	2008-12-22 11:39:21 UTC (rev 676)
@@ -0,0 +1,36 @@
+<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">
+   <parent>
+      <artifactId>parent</artifactId>
+      <groupId>org.jboss.webbeans</groupId>
+      <version>1.0.0.ALPHA1</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.jboss.webbeans</groupId>
+   <artifactId>webbeans-ri-spi</artifactId>
+   <name>Web Beans RI Service Provider Interfaces</name>
+   <dependencies>
+
+      <dependency>
+         <groupId>org.jboss.webbeans</groupId>
+         <artifactId>webbeans-api</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+         <classifier>jdk15</classifier>
+      </dependency>
+      
+      <dependency>
+         <groupId>com.google.collections</groupId>
+         <artifactId>google-collections</artifactId>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+   	<defaultGoal>install</defaultGoal>
+   </build>
+
+</project>
\ No newline at end of file

Copied: ri/tags/1.0.0.ALPHA1/webbeans-ri-spi/src (from rev 666, ri/trunk/webbeans-ri-spi/src)




More information about the weld-commits mailing list