[jboss-cvs] JBossAS SVN: r91803 - in trunk: build and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jul 29 22:43:51 EDT 2009


Author: pgier
Date: 2009-07-29 22:43:51 -0400 (Wed, 29 Jul 2009)
New Revision: 91803

Added:
   trunk/testsuite/pom.xml
Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/ejb3/pom.xml
   trunk/pom.xml
   trunk/server/pom.xml
   trunk/testsuite/build.xml
   trunk/tomcat/pom.xml
Log:
[JBBUILD-539] Replace thirdparty pom with poms in build and testsuite directories.

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/build/build.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -39,7 +39,7 @@
           description="Initialize thirdparty dependency configuration">
     
     <!-- Set a default file to use to define the thirdparty dependencies. -->
-    <property name="thirdparty.pom.file" location="../thirdparty/pom.xml"/>
+    <property name="thirdparty.pom.file" location="pom.xml"/>
     
     <!-- 
       -  Initialize properties for each dependency in the thirdparty pom 
@@ -62,6 +62,8 @@
     <maven:dependencies addArtifactFileSetRefs="true">
       <dependency groupId="jboss.jbossts" artifactId="jbossts-tools" 
                   version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
+      <dependency groupId="jboss.jbossts" artifactId="jbossxts" 
+                  version="${component-matrix.project.properties.version.jboss.jbossts}" type="sar"/>
       <dependency groupId="org.jboss.jaxr" artifactId="juddi-service" 
                   version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
     </maven:dependencies>
@@ -81,7 +83,6 @@
     <dirname property="project.root" file="${basedir}"/>
     <property name="project.build" value="${project.root}/build"/>
     <property name="project.tools" value="${project.root}/tools"/>
-    <property name="project.thirdparty" value="${project.root}/thirdparty"/>
     
     <!-- Setup the build timestamp & build identifer properties -->
     <tstamp>
@@ -2234,14 +2235,18 @@
       </patternset>
     </unzip>
 
-    <copy tofile="${install.all.conf}/jbossts-properties.xml" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTA"/>
+    <unjar src="${jboss.jbossts:resources:jar}" dest="${install.all.conf}">
+      <patternset>
+        <include name="jbossts-properties.xml-forJTA"/>
+      </patternset>
+      <mapper type="glob" from="jbossts-properties.xml-forJTA" to="jbossts-properties.xml"/>
+    </unjar>
 
     <!-- in in JTS mode the client needs some impl classes to make ClientUserTransaction work -->
     <copy todir="${install.client}" filtering="no">
-      <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
-        <include name="jbossjts.jar"/>
-        <include name="jbossjts-integration.jar"/>
-      </fileset>
+      <fileset refid="jboss.jbossts:jbossjts:jar"/>
+      <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+      <mapper refid="remove-versions" />
     </copy>
 
     <unzip src="${jacorb:resources:jar}" dest="${install.all.conf}">
@@ -2257,8 +2262,16 @@
       <mapper refid="remove-versions" />
     </copy>
 
-    <copy todir="${install.examples}/transactions" filtering="no" file="${project.thirdparty}/jboss/jbossts/lib/jbossxts.sar"/>
-    <copy tofile="${install.examples}/transactions/jbossts-properties.xml" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTS"/>
+    <copy todir="${install.examples}/transactions" filtering="no">
+      <fileset refid="jboss.jbossts:jbossxts:sar"/>
+      <mapper refid="remove-versions" />
+    </copy>
+    <unjar src="${jboss.jbossts:resources:jar}" dest="${install.examples}/transactions/">
+      <patternset>
+        <include name="jbossts-properties.xml-forJTS"/>
+      </patternset>
+      <mapper type="glob" from="jbossts-properties.xml-forJTS" to="jbossts-properties.xml"/>
+    </unjar>
 
     <!-- copy JBossTS additions install script and instructions from jbossas-transactions module -->
     <copy todir="${install.examples}/transactions" filtering="no">

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/build/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -111,10 +111,347 @@
 
     <!-- Dependencies on additional artifacts not included by the modules  -->
     <dependency>
+      <groupId>apache-avalon</groupId>
+      <artifactId>avalon-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-avalon-logkit</groupId>
+      <artifactId>logkit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-bsf</groupId>
+      <artifactId>bsf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-scout</groupId>
+      <artifactId>scout</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-xalan</groupId>
+      <artifactId>serializer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-xalan</groupId>
+      <artifactId>xalan</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-xerces</groupId>
+      <artifactId>resolver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>jacorb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>resources</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jaxbintros</groupId>
+      <artifactId>jboss-jaxb-intros</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossjts</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossjts-integration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossjts-jacorb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossts-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossts-tools</artifactId>
+      <type>jboss-sar</type>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossxts</artifactId>
+      <type>jboss-sar</type>
+    </dependency>
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>resources</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jboss-messaging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>jboss-messaging-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.messaging</groupId>
+      <artifactId>resources</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.web</groupId>
+      <artifactId>el-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>juddi</groupId>
+      <artifactId>juddi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-lgpl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
       <artifactId>jboss-aop-deployers</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-impl-as</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-impl-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-impl-mc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-spi-as</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bootstrap</groupId>
+      <artifactId>jboss-bootstrap-spi-mc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy-clustered</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy-impl</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy-spi</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-security</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-javaee</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jaxr</groupId>
+      <artifactId>juddi-service</artifactId>
+      <type>jboss-sar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-jdk</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-logmanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>logging-service-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logmanager</groupId>
+      <artifactId>jboss-logmanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logmanager</groupId>
+      <artifactId>jboss-logmanager-log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.seam.integration</groupId>
+      <artifactId>jboss-seam-int-jbossas</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jboss-negotiation</artifactId>              
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.slf4j</groupId>
+      <artifactId>slf4j-jboss-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.slf4j</groupId>
+      <artifactId>slf4j-jboss-logmanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.threads</groupId>
+      <artifactId>jboss-threads</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.threads</groupId>
+      <artifactId>jboss-threads-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.webbeans.integration</groupId>
+      <artifactId>webbeans-jboss-int-deployer</artifactId>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-management</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-jaxrpc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-jaxws</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-jaxws-ext</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-resources</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-saaj</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.xnio</groupId>
+      <artifactId>xnio-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.xnio</groupId>
+      <artifactId>xnio-nio</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.xnio</groupId>
+      <artifactId>xnio-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi_R4_core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>snmptrapappender</groupId>
+      <artifactId>snmpTrapAppender</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-fi</groupId>
+      <artifactId>FastInfoset</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-fi</groupId>
+      <artifactId>FastInfosetUtilities</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-jaxb</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-jaxb</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>jaxws-rt</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>jaxws-tools</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>stax-ex</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sun-jaxws</groupId>
+      <artifactId>streambuffer</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>wscommons-policy</groupId>
+      <artifactId>policy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>wutka-dtdparser</groupId>
+      <artifactId>dtdparser</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
     
+    <!-- End dist dependencies -->
+    
   </dependencies>
   
   <profiles>

Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/ejb3/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -66,17 +66,8 @@
                     <include name="**"/>
                   </fileset>
                 </copy>
-                
-                <!--<property name="output.lib" location="target"/>
-                <mkdir dir="${output.lib}"/>
-                <copy file="target/${project.build.finalName}-client.jar"
-                      tofile="${output.lib}/jboss-appclient.jar"/>
-                <copy file="target/${project.build.finalName}-deployer.jar"
-                      tofile="${output.lib}/jboss-ejb3-deployer.jar"/>
-                <copy file="target/${project.build.finalName}-iiop.jar"
-                      tofile="${output.lib}/jboss-ejb3-iiop.jar"/>-->
-                
-                <unjar src="../thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" dest="target/resources">
+                                
+                <unjar src="${maven.dependency.org.jboss.ejb3.jboss-ejb3-core.client.jar.path}" dest="target/resources">
                   <patternset>
                     <include name="*.xml" />
                     <exclude name="META-INF/*.xml" />

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -468,7 +468,6 @@
       </activation>
       <modules>
         <module>component-matrix</module>
-        <module>thirdparty</module>
         <module>main</module>
         <module>system</module>
         <module>system-jmx</module>
@@ -494,6 +493,7 @@
         <module>spring-int</module>
         <module>client</module>
         <module>build</module>
+        <module>testsuite</module>
       </modules>
     </profile>
     

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/server/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -207,26 +207,7 @@
                     <include name="**"/>
                   </fileset>
                 </copy>
-                
-                <!--<property name="build.lib" value="output/lib"/>
-                <mkdir dir="${build.lib}"/>
-                <copy file="target/${artifactId}-${version}-client.jar"
-                      tofile="${build.lib}/jboss-client.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss-minimal.jar"
-                      tofile="${build.lib}/jboss-minimal.jar"/>
-                <copy file="target/${artifactId}-${version}-jboss.jar"
-                      tofile="${build.lib}/jboss.jar"/>
-                <copy file="target/${artifactId}-${version}-jmx-adaptor-plugin.jar"
-                      tofile="${build.lib}/jmx-adaptor-plugin.jar"/>
-                <copy file="target/${artifactId}-${version}-jmx-invoker-adaptor-client.jar"
-                      tofile="${build.lib}/jmx-invoker-adaptor-client.jar"/>
-                <copy file="target/${artifactId}-${version}-shutdown.jar"
-                      tofile="${build.lib}/shutdown.jar"/>
-                <copy file="target/${artifactId}-${version}-testsuite-support.jar"
-                      tofile="${build.lib}/testsuite-support.jar"/>
-                <copy file="target/${artifactId}-${version}-verifier.jar"
-                      tofile="${build.lib}/verifier.jar"/>-->
-                
+                                
                 <!-- uuid-key-generator.sar -->
                 <mkdir dir="target/uuid-key-generator.sar"/>
                 <copy todir="target/uuid-key-generator.sar">
@@ -242,13 +223,9 @@
                 </copy>
 
                 <!-- copy the service binding manager jars to their deployment --> 
-                <property name="thirdparty.dir" location="../thirdparty"/>
-                
                 <copy todir="target/etc/conf/all/bindingservice.beans">
-                   <fileset dir="${thirdparty.dir}/org/jboss/service/binding/lib">
-                      <include name="jboss-service-binding-core.jar"/>
-                      <include name="jboss-service-binding-mgmt.jar"/>
-                   </fileset>
+                  <fileset file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-core.jar.path}"/>
+                  <fileset file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-mgmt.jar.path}"/>
                 </copy>
             
                 <!-- SQLException Processor -->
@@ -441,6 +418,16 @@
       <artifactId>getopt</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.service.binding</groupId>
+      <artifactId>jboss-service-binding-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.service.binding</groupId>
+      <artifactId>jboss-service-binding-mgmt</artifactId>
+    </dependency>
+    
   </dependencies>
   
 </project>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/testsuite/build.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -482,7 +482,7 @@
     <!-- ================================================================== -->
 
     <!-- Set a default file to use to define the thirdparty dependencies. -->
-    <property name="thirdparty.pom.file" location="../thirdparty/pom.xml"/>
+    <property name="thirdparty.pom.file" location="pom.xml"/>
     
     <!-- 
       -  Initialize properties for each dependency in the thirdparty pom 
@@ -536,20 +536,6 @@
      <property name="init.target.complete" value="true"/>
    </target>
 
-   <!-- retrieve items from the repository, store them in the -->
-   <!-- thirdparty folder, and create a testsuite-libraries.ent file -->
-   <!-- then generate a new libraries.ent file and include it in  -->
-   <!-- the build                                                 -->
-   <target name="createthirdparty" unless="inhibit.downloads"
-      depends="check.inhibit.downloads, set.proxy">
-      <condition property="mvn.cmd" value="mvn.bat" else="mvn">
-         <os family="windows"/>
-      </condition>
-      <exec executable="${mvn.cmd}" dir="../thirdparty">
-        <arg line="package"/>
-      </exec>
-   </target>
-
    <!-- check if thirdparty libraries are to be downloaded -->
    <target name="check.inhibit.downloads">
       <condition property="inhibit.downloads">
@@ -743,7 +729,7 @@
 
    <target name="main"
       description="Executes the default target (most)."
-      depends="createthirdparty,most"/>
+      depends="most"/>
 
    <target name="all"
       description="Builds everything."

Added: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml	                        (rev 0)
+++ trunk/testsuite/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -0,0 +1,174 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.jboss.jbossas</groupId>
+		<artifactId>jboss-as-build</artifactId>
+		<version>6.0.0-SNAPSHOT</version>
+    <relativePath>../build</relativePath>
+	</parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.jbossas</groupId>
+  <artifactId>jboss-as-testsuite</artifactId>
+  <packaging>pom</packaging>
+  <name>JBoss Application Server Testsuite</name>
+  <url>http://www.jboss.org/jbossas</url>
+  <description>JBoss Application Server Testsuite</description>
+
+  <!-- 
+    -  This pom lists dependencies used in the testsuite which are not included in the
+    -  application server distribution build.
+    -->
+  <dependencies>
+    
+    <dependency>
+      <groupId>apache-discovery</groupId>
+      <artifactId>commons-discovery</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-jaxme</groupId>
+      <artifactId>jaxmexs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-myfaces</groupId>
+      <artifactId>myfaces-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-myfaces</groupId>
+      <artifactId>myfaces-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>idl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>idl_g</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jacorb</groupId>
+      <artifactId>jacorb_g</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jboss.web</groupId>
+      <artifactId>jasper-jdt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>objectweb-joramtests</groupId>
+      <artifactId>joramtests</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>odmg</groupId>
+      <artifactId>odmg</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jaxr</groupId>
+      <artifactId>juddi-saaj</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>sleepycat</groupId>
+      <artifactId>je</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+    </dependency>
+    
+  </dependencies>
+  
+  <profiles>
+    <profile>
+      <id>testsuite</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>run-tests</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <tasks>
+                    <ant antfile="build.xml">
+                      <target name="tests"/>
+                    </ant>
+                 </tasks>
+                </configuration>
+              </execution>
+              <execution>
+                <id>clean</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>clean</phase>
+                <configuration>
+                  <tasks>
+                    <ant antfile="build.xml">
+                      <target name="clean"/>
+                    </ant>
+                 </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>      
+        </plugins>
+      </build>
+    </profile>    
+  </profiles>
+  
+</project>


Property changes on: trunk/testsuite/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2009-07-30 02:32:35 UTC (rev 91802)
+++ trunk/tomcat/pom.xml	2009-07-30 02:43:51 UTC (rev 91803)
@@ -108,29 +108,20 @@
                 <copy tofile="${output.deploy}/jbossweb.sar/META-INF/jboss-scanning.xml"
                       file="${output.resources}/jboss-scanning.xml"/>
                     
-                <property name="thirdparty.dir" location="../thirdparty"/>
-                
                 <copy file="${output.resources}/context.xml"
                   todir="${output.deploy}/jbossweb.sar"/>
                 <copy file="${output.resources}/server.xml"
                   tofile="${output.deploy}/jbossweb.sar/server.xml"/>
                 <copy todir="${output.deploy}/jbossweb.sar">
-                  <fileset dir="${thirdparty.dir}/jboss/web/lib">
-                    <include name="*.jar"/>
-                    <exclude name="el-api.jar"/>
-                    <exclude name="jsp-api.jar"/>
-                    <exclude name="servlet-api.jar"/>
-                    <exclude name="jbossweb-sources.jar"/>
-                  </fileset>
+                  <fileset file="${maven.dependency.jboss.web.jasper-jdt.jar.path}"/>
+                  <fileset file="${maven.dependency.jboss.web.jbossweb.jar.path}"/>
                 </copy>
                 <copy todir="${output.deploy}/jbossweb.sar"
-                   file="${thirdparty.dir}/sun-jstl/lib/jstl.jar" />        
+                   file="${maven.dependency.javax.servlet.jstl.jar.path}" />        
                 <mkdir dir="${output.deploy}/jbossweb.sar/jsf-libs"/>
                 <copy todir="${output.deploy}/jbossweb.sar/jsf-libs">        
-                   <fileset dir="${thirdparty.dir}/sun-jsf/lib">           
-                      <include name="*.jar"/>
-                      <exclude name="*-sources.jar"/>
-                   </fileset>
+                  <fileset file="${maven.dependency.javax.faces.jsf-api.jar.path}"/>
+                  <fileset file="${maven.dependency.javax.faces.jsf-impl.jar.path}"/>
                 </copy>
                 
                 <!-- jar for jsf integration classes -->
@@ -166,9 +157,17 @@
     </dependency>
     <dependency>
       <groupId>javax.faces</groupId>
+      <artifactId>jsf-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.faces</groupId>
       <artifactId>jsf-impl</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+    <dependency>
       <groupId>jacorb</groupId>
       <artifactId>jacorb</artifactId>
     </dependency>
@@ -207,6 +206,10 @@
       <artifactId>jbossweb</artifactId>
     </dependency>
     <dependency>
+      <groupId>jboss.web</groupId>
+      <artifactId>jasper-jdt</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.ws.native</groupId>
       <artifactId>jbossws-native-jaxws</artifactId>
     </dependency>




More information about the jboss-cvs-commits mailing list