[webbeans-commits] Webbeans SVN: r622 - in ri/trunk: jboss-as and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-12-20 12:14:43 -0500 (Sat, 20 Dec 2008)
New Revision: 622

Added:
   ri/trunk/readme.txt
Modified:
   ri/trunk/jboss-as/build.xml
   ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml
   ri/trunk/pom.xml
Log:
add readme, update for spi move, add integration deployer bean

Modified: ri/trunk/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml	2008-12-20 17:11:55 UTC (rev 621)
+++ ri/trunk/jboss-as/build.xml	2008-12-20 17:14:43 UTC (rev 622)
@@ -12,7 +12,9 @@
 		<delete dir="target" failonerror="false"/>
 	</target>
 
-	<target name="update" depends="install-jboss-ejb3-update" description="Update JBoss 5 for the Web Beans RI">
+	<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=..."/>
 
@@ -24,6 +26,7 @@
 		<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>
@@ -50,11 +53,22 @@
 				<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-*.jar" />
+				<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>

Modified: ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml
===================================================================
--- ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml	2008-12-20 17:11:55 UTC (rev 621)
+++ ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml	2008-12-20 17:14:43 UTC (rev 622)
@@ -6,6 +6,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
   <!-- Web Beans deployer -->
-  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+  <bean name="WebBeansDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeansWebUrlIntegrationDeployer"/>
 
 </deployment>

Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml	2008-12-20 17:11:55 UTC (rev 621)
+++ ri/trunk/pom.xml	2008-12-20 17:14:43 UTC (rev 622)
@@ -58,16 +58,12 @@
    <modules>
       <module>webbeans-api</module>
       <module>webbeans-ri</module>
+      <module>webbeans-ri-spi</module>
       <module>examples</module>
    </modules>
 
    <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.jboss.webbeans</groupId>
-            <artifactId>webbeans-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-         </dependency>
 
          <dependency>
             <groupId>org.testng</groupId>
@@ -171,6 +167,12 @@
             <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>

Added: ri/trunk/readme.txt
===================================================================
--- ri/trunk/readme.txt	                        (rev 0)
+++ ri/trunk/readme.txt	2008-12-20 17:14:43 UTC (rev 622)
@@ -0,0 +1,26 @@
+Web Beans RI
+------------
+
+This distribution consists of:
+
+doc/
+   -- The Web Beans Reference guide, take a look at doc/en/html/index.html for
+      getting started using Web Beans and the Web Beans RI
+ 
+examples/
+   -- The Web Beans RI examples, the examples are described in more detail in 
+      the reference guide 
+   
+jboss-as/
+   -- Installer for JBoss AS, change into this directory, and run ant install
+      There are more details in the reference guide
+
+lib/
+   -- Libraries for building the examples
+   
+lib/webbeans
+   -- The Web Beans RI and API jars, for use outside of JBoss AS
+   
+src/
+   -- The sources of the Web Beans RI, including src/webbeans-api, 
+      src/webbeans-ri and src/reference
\ No newline at end of file