[jboss-cvs] JBossAS SVN: r81721 - in trunk: component-matrix and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-11-27 06:02:20 -0500 (Thu, 27 Nov 2008)
New Revision: 81721

Added:
   trunk/varia/src/resources/seam/jboss-structure.xml
Modified:
   trunk/build/build-distr.xml
   trunk/component-matrix/pom.xml
   trunk/testsuite/imports/server-config.xml
   trunk/varia/build.xml
Log:
[JBAS-6015]; update Seam-int.
Remove lib-opt.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-11-27 10:51:35 UTC (rev 81720)
+++ trunk/build/build-distr.xml	2008-11-27 11:02:20 UTC (rev 81721)
@@ -1191,8 +1191,8 @@
     </copy>
 
     <!-- Create optional libs; e.g. seam-integration -->
-    <mkdir dir="${install.server}/all/lib-opt"/>
-    <copy todir="${install.server}/all/lib-opt" filtering="no">
+    <mkdir dir="${install.server}/all/deployers/seam.deployer/lib-int"/>
+    <copy todir="${install.server}/all/deployers/seam.deployer/lib-int" filtering="no">
       <fileset dir="${org.jboss.seam.integration.lib}">
          <include name="jboss-seam-int-jbossas.jar"/>
       </fileset>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-27 10:51:35 UTC (rev 81720)
+++ trunk/component-matrix/pom.xml	2008-11-27 11:02:20 UTC (rev 81721)
@@ -82,7 +82,7 @@
     <version.sun-jaxws>2.1.1</version.sun-jaxws>
     <version.sun.jaxb>2.1.9</version.sun.jaxb>
     <version.xdoclet>1.2.3</version.xdoclet>
-    <version.seam.integration>5.0.0.CR7</version.seam.integration>
+    <version.seam.integration>5.0.0.GA</version.seam.integration>
   </properties>
 
   <!-- Build Configuration -->

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-11-27 10:51:35 UTC (rev 81720)
+++ trunk/testsuite/imports/server-config.xml	2008-11-27 11:02:20 UTC (rev 81721)
@@ -965,7 +965,6 @@
             <fileset dir="${jboss.dist}/server/@{baseconf}">
             <include name="conf/**"/>
             <include name="lib/**"/>
-            <include name="lib-opt/**"/>
             <include name="deploy/**"/>
             <include name="deployers/**"/>
          </fileset>         	
@@ -991,7 +990,6 @@
          <fileset dir="${jboss.dist}/server/@{baseconf}">
             <include name="conf/**"/>
             <include name="lib/**"/>
-            <include name="lib-opt/**"/>
             <include name="deploy/**"/>
             <include name="deployers/**"/>
          </fileset>

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2008-11-27 10:51:35 UTC (rev 81720)
+++ trunk/varia/build.xml	2008-11-27 11:02:20 UTC (rev 81721)
@@ -549,7 +549,9 @@
     <mkdir dir="${build.deployers}/seam.deployer/META-INF"/>
 
     <copy todir="${build.deployers}/seam.deployer/META-INF">
-       <fileset file="${source.resources}/seam/seam-deployers-jboss-beans.xml"/>
+       <fileset dir="${source.resources}/seam">
+         <include name="*.xml"/>
+       </fileset>
     </copy>
 
     <copy todir="${build.deployers}/seam.deployer">

Copied: trunk/varia/src/resources/seam/jboss-structure.xml (from rev 81638, trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml)
===================================================================
--- trunk/varia/src/resources/seam/jboss-structure.xml	                        (rev 0)
+++ trunk/varia/src/resources/seam/jboss-structure.xml	2008-11-27 11:02:20 UTC (rev 81721)
@@ -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>


Property changes on: trunk/varia/src/resources/seam/jboss-structure.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native