[jboss-cvs] JBossAS SVN: r81652 - in trunk: client and 4 other directories.

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

Author: pgier
Date: 2008-11-26 12:41:08 -0500 (Wed, 26 Nov 2008)
New Revision: 81652

Modified:
   trunk/build/build-distr.xml
   trunk/client/pom.xml
   trunk/component-matrix/pom.xml
   trunk/testsuite/build.xml
   trunk/thirdparty/pom.xml
   trunk/tools/etc/buildmagic/libraries.ent
Log:
[JBAS-6055] Exclude extra xmlsec dependency.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/build/build-distr.xml	2008-11-26 17:41:08 UTC (rev 81652)
@@ -1854,7 +1854,7 @@
       <fileset dir="${apache.logging.lib}">
         <include name="commons-logging.jar"/>
       </fileset>
-      <fileset dir="${apache.xmlsec.lib}">
+      <fileset dir="${xml.security.lib}">
         <include name="xmlsec.jar"/>
       </fileset>
       <fileset dir="${ibm.wsdl4j.lib}">

Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/client/pom.xml	2008-11-26 17:41:08 UTC (rev 81652)
@@ -245,7 +245,7 @@
     </dependency>
     
     <dependency>
-      <groupId>apache-xmlsec</groupId>
+      <groupId>xml-security</groupId>
       <artifactId>xmlsec</artifactId>
     </dependency>
     

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/component-matrix/pom.xml	2008-11-26 17:41:08 UTC (rev 81652)
@@ -287,7 +287,7 @@
       </dependency>
       
       <dependency>
-        <groupId>apache-xmlsec</groupId>
+        <groupId>xml-security</groupId>
         <artifactId>xmlsec</artifactId>
         <version>1.3.0</version>
       </dependency>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/testsuite/build.xml	2008-11-26 17:41:08 UTC (rev 81652)
@@ -106,7 +106,7 @@
       <path refid="apache.jaxme.classpath"/>
       <path refid="apache.scout.classpath"/>
       <path refid="apache.xerces.classpath"/>
-      <path refid="apache.xmlsec.classpath"/>
+      <path refid="xml.security.classpath"/>
       <path refid="dom4j.dom4j.classpath"/>
       <path refid="httpunit.httpunit.classpath"/>
       <path refid="ibm.wsdl4j.classpath"/>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/thirdparty/pom.xml	2008-11-26 17:41:08 UTC (rev 81652)
@@ -1082,7 +1082,7 @@
       <artifactId>xml-apis</artifactId>
     </dependency>
     <dependency>
-      <groupId>apache-xmlsec</groupId>
+      <groupId>xml-security</groupId>
       <artifactId>xmlsec</artifactId>
     </dependency>
     <dependency>

Modified: trunk/tools/etc/buildmagic/libraries.ent
===================================================================
--- trunk/tools/etc/buildmagic/libraries.ent	2008-11-26 17:34:03 UTC (rev 81651)
+++ trunk/tools/etc/buildmagic/libraries.ent	2008-11-26 17:41:08 UTC (rev 81652)
@@ -270,11 +270,11 @@
     <pathelement path="${apache.wss4j.lib}/wss4j.jar"/>
   </path>
 
-  <!-- Apache XMLSec -->
-  <property name="apache.xmlsec.root" value="${project.thirdparty}/apache-xmlsec"/>
-  <property name="apache.xmlsec.lib" value="${apache.xmlsec.root}/lib"/>
-  <path id="apache.xmlsec.classpath">
-    <pathelement path="${apache.xmlsec.lib}/xmlsec.jar"/>
+  <!-- XML Security XMLSec -->
+  <property name="xml.security.root" value="${project.thirdparty}/xml-security"/>
+  <property name="xml.security.lib" value="${xml.security.root}/lib"/>
+  <path id="xml.security.classpath">
+    <pathelement path="${xml.security.lib}/xmlsec.jar"/>
   </path>
 
   <!-- Bouncy Castle JCE Provider -->