[webbeans-commits] Webbeans SVN: r593 - in ri/trunk/jboss-as: resources and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-12-19 13:29:25 -0500 (Fri, 19 Dec 2008)
New Revision: 593

Added:
   ri/trunk/jboss-as/resources/jboss-structure.xml
   ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml
Removed:
   ri/trunk/jboss-as/jboss-structure.xml
   ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml
Modified:
   ri/trunk/jboss-as/build.xml
Log:
update script

Modified: ri/trunk/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml	2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/build.xml	2008-12-19 18:29:25 UTC (rev 593)
@@ -1,14 +1,18 @@
 <?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" />
+	<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}/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">
+	<target name="update" depends="install-jboss-ejb3-update" description="Update JBoss 5 for the Web Beans RI">
 
 		<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
 
@@ -37,7 +41,7 @@
 		<mkdir dir="target/webbeans.deployer/META-INF" />
 
 		<copy todir="target/webbeans.deployer/META-INF">
-			<fileset dir="${basedir}/webbeans-ri">
+			<fileset dir="${basedir}/resources">
 				<include name="webbeans-deployers-jboss-beans.xml"/>
 				<include name="jboss-structure.xml"/>
 			</fileset>

Deleted: ri/trunk/jboss-as/jboss-structure.xml
===================================================================
--- ri/trunk/jboss-as/jboss-structure.xml	2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/jboss-structure.xml	2008-12-19 18:29:25 UTC (rev 593)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<structure>
-    <context>
-        <path name=""/>
-        <metaDataPath>
-            <path name="META-INF"/>
-        </metaDataPath>
-        <classpath>
-            <path name="" suffixes=".jar" />
-        </classpath>
-    </context>
-</structure>

Copied: ri/trunk/jboss-as/resources/jboss-structure.xml (from rev 592, ri/trunk/jboss-as/jboss-structure.xml)
===================================================================
--- ri/trunk/jboss-as/resources/jboss-structure.xml	                        (rev 0)
+++ ri/trunk/jboss-as/resources/jboss-structure.xml	2008-12-19 18:29:25 UTC (rev 593)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+    <context>
+        <path name=""/>
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>
+        <classpath>
+            <path name="" suffixes=".jar" />
+        </classpath>
+    </context>
+</structure>

Copied: ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml (from rev 592, ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml)
===================================================================
--- ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml	                        (rev 0)
+++ ri/trunk/jboss-as/resources/webbeans-deployers-jboss-beans.xml	2008-12-19 18:29:25 UTC (rev 593)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Web Beans RI + JBossAS integration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- Web Beans deployer -->
+  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+
+</deployment>

Deleted: ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml
===================================================================
--- ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml	2008-12-19 18:26:43 UTC (rev 592)
+++ ri/trunk/jboss-as/webbeans-deployers-jboss-beans.xml	2008-12-19 18:29:25 UTC (rev 593)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Web Beans RI + JBossAS integration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <!-- Web Beans deployer -->
-  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
-
-</deployment>