[jboss-cvs] JBossAS SVN: r88368 - in branches/Branch_5_x: component-matrix and 1 other directories.

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

Author: darran.lofthouse at jboss.com
Date: 2009-05-07 11:29:01 -0400 (Thu, 07 May 2009)
New Revision: 88368

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
[JBPAPP-6564] Include JBoss Negotiation 2.0.3.SP1

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-05-07 14:57:24 UTC (rev 88367)
+++ branches/Branch_5_x/build/build-distr.xml	2009-05-07 15:29:01 UTC (rev 88368)
@@ -1939,6 +1939,9 @@
       <fileset dir="${jboss.cache.jbosscache.pojo.lib}">
         <include name="jbosscache-pojo.jar"/>
       </fileset>
+      <fileset dir="${jboss.jboss.negotiation.lib}">
+        <include name="jboss-negotiation.jar"/>
+      </fileset>      
       <fileset dir="${jboss.jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>
       </fileset>
@@ -1947,6 +1950,9 @@
       </fileset>
       <fileset dir="${jboss.security.lib}">
         <include name="jbossxacml.jar"/>
+      </fileset>      
+      <fileset dir="${jboss.security.lib}">
+        <include name="jbossxacml.jar"/>
       </fileset>
       <fileset dir="${org.slf4j.lib}">
         <include name="slf4j-api.jar"/>

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-05-07 14:57:24 UTC (rev 88367)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-05-07 15:29:01 UTC (rev 88368)
@@ -84,6 +84,7 @@
     <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
     <version.org.jboss.remoting>2.5.1</version.org.jboss.remoting>
     <version.org.jboss.security>2.0.3.SP1</version.org.jboss.security>
+    <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
     <version.org.jboss.threads>1.0.0.CR4</version.org.jboss.threads>
     <version.org.jboss.vfs>2.1.1.GA</version.org.jboss.vfs>
     <version.org.jboss.xnio.metadata>1.0.0.CR1</version.org.jboss.xnio.metadata>
@@ -1843,6 +1844,12 @@
         <artifactId>jbosssx</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.security</groupId>
+        <artifactId>jboss-negotiation</artifactId>
+        <version>${version.org.jboss.security.negotiation}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.jboss.threads</groupId>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-05-07 14:57:24 UTC (rev 88367)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-05-07 15:29:01 UTC (rev 88368)
@@ -647,6 +647,13 @@
               </mapping>
             </dependency>
             <dependency>
+              <groupId>org.jboss.security</groupId>
+              <artifactId>jboss-negotiation</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-negotiation</componentId>
+              </mapping>              
+            </dependency>            
+            <dependency>
               <groupId>org.jboss</groupId>
               <artifactId>jboss-vfs</artifactId>
               <mapping>
@@ -1892,6 +1899,10 @@
     </dependency>    
     <dependency>
       <groupId>org.jboss.security</groupId>
+      <artifactId>jboss-negotiation</artifactId>              
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
       <artifactId>jbossxacml</artifactId>
     </dependency>
     <dependency>