[jboss-cvs] JBossAS SVN: r92088 - in trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 6 16:34:34 EDT 2009
Author: pgier
Date: 2009-08-06 16:34:34 -0400 (Thu, 06 Aug 2009)
New Revision: 92088
Modified:
trunk/build/pom.xml
trunk/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/jsr77.xml
trunk/testsuite/imports/sections/security.xml
Log:
[JBBUILD-419] Use ant tasks to reference module jars instead of modules.ent.
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2009-08-06 20:33:43 UTC (rev 92087)
+++ trunk/build/pom.xml 2009-08-06 20:34:34 UTC (rev 92088)
@@ -38,6 +38,26 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-common-jdbc-wrapper</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca-deployer</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-local-jdbc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-console</artifactId>
</dependency>
<dependency>
@@ -88,6 +108,21 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>ejb-management</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77-client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-profileservice</artifactId>
</dependency>
<dependency>
@@ -100,6 +135,16 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jboss</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-adaptor-plugin</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-spring-int</artifactId>
</dependency>
<dependency>
@@ -130,6 +175,11 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <classifier>jboss-srp</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</dependency>
<!-- End module dependencies -->
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-08-06 20:33:43 UTC (rev 92087)
+++ trunk/pom.xml 2009-08-06 20:34:34 UTC (rev 92088)
@@ -255,6 +255,30 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-common-jdbc-wrapper</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-jca</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-jca-deployer</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-local-jdbc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-console</artifactId>
<version>${project.version}</version>
</dependency>
@@ -331,6 +355,18 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-management</artifactId>
<version>${project.version}</version>
+ <classifier>ejb-management</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <version>${project.version}</version>
+ <classifier>jsr77</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <version>${project.version}</version>
<classifier>jsr77-client</classifier>
</dependency>
<dependency>
@@ -363,6 +399,18 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<version>${project.version}</version>
+ <classifier>jboss</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>jmx-adaptor-plugin</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${project.version}</version>
<classifier>jmx-invoker-adaptor-client</classifier>
</dependency>
<dependency>
@@ -422,6 +470,12 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-srp</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-08-06 20:33:43 UTC (rev 92087)
+++ trunk/testsuite/build.xml 2009-08-06 20:34:34 UTC (rev 92088)
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
-]>
<!-- ============================================================ -->
<!-- JBoss, the OpenSource J2EE webOS -->
@@ -169,11 +166,6 @@
<property name="module.Name" value="JBoss Testsuite"/>
<property name="module.version" value="DEV"/>
- <!-- ======= -->
- <!-- Modules -->
-
- &modules;
-
<target name="init-paths" depends="init-dependencies" unless="init-paths.target.complete"
description="initialize the classpath refs">
@@ -375,7 +367,7 @@
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-deployment:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-deployment:jar:jboss-jsr88"/>
- <path refid="jboss.hibernate.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-hibernate-int:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
<path refid="jboss.internal-server.classpath"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
@@ -390,15 +382,21 @@
<fileset refid="org.jboss.javaee:jboss-jms-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-transaction-api:jar"/>
<fileset refid="org.jboss:jboss-vfs:jar"/>
- <path refid="jboss.jca.classpath"/>
- <path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.management.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca-deployer"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-local-jdbc"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-common-jdbc-wrapper"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-jmx-remoting:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-management:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-management:jar:jsr77"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-management:jar:jsr77-client"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
- <path refid="jboss.profileservice.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-profileservice:jar"/>
<fileset refid="org.jboss.security:jboss-security-spi:jar"/>
<fileset refid="org.jboss.security:jbosssx:jar"/>
- <path refid="jboss.security.int.classpath"/>
- <path refid="jboss.server.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-security:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-server:jar:jboss"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-server:jar:jmx-adaptor-plugin"/>
<fileset refid="org.jboss.jbossas:jboss-as-main:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-as:jar"/>
@@ -406,17 +404,17 @@
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-base:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-as:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.systemjmx.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-system:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-system-jmx:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
- <path refid="jboss.varia.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-varia:jar"/>
<fileset refid="jboss.web:el-api:jar"/>
<fileset refid="jboss.web:jasper-jdt:jar"/>
<fileset refid="jboss.web:jbossweb:jar"/>
<fileset refid="jboss.web:jsp-api:jar"/>
<fileset refid="jboss.web:servlet-api:jar"/>
- <path refid="jboss.spring.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-spring-int:jar"/>
</path>
<!-- The combined thirdparty classpath -->
@@ -441,7 +439,7 @@
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar:client"/>
- <path refid="jboss.jmx-remoting.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-jmx-remoting:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
<path refid="thirdparty.classpath"/>
@@ -461,7 +459,7 @@
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar:client"/>
- <path refid="jboss.jmx-remoting.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-jmx-remoting:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -2243,7 +2241,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
- <path refid="jboss.varia.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-varia:jar"/>
</classpath>
<!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
Modified: trunk/testsuite/imports/sections/jsr77.xml
===================================================================
--- trunk/testsuite/imports/sections/jsr77.xml 2009-08-06 20:33:43 UTC (rev 92087)
+++ trunk/testsuite/imports/sections/jsr77.xml 2009-08-06 20:34:34 UTC (rev 92088)
@@ -1,10 +1,10 @@
<project name="tests-jsr77-jars">
<!-- jsr77 test -->
- <target name="_jars-jsr77">
+ <target name="_jars-jsr77" depends="init">
<mkdir dir="${build.lib}"/>
<!-- Copy the ejb connector -->
- <copy file="${jboss.management.lib}/jboss-as-management-ejb-management.jar"
+ <copy file="${org.jboss.jbossas:jboss-as-management:jar:ejb-management}"
tofile="${build.lib}/ejb-management.jar"/>
</target>
</project>
Modified: trunk/testsuite/imports/sections/security.xml
===================================================================
--- trunk/testsuite/imports/sections/security.xml 2009-08-06 20:33:43 UTC (rev 92087)
+++ trunk/testsuite/imports/sections/security.xml 2009-08-06 20:34:34 UTC (rev 92088)
@@ -1,6 +1,6 @@
<project name="tests-security-jars">
<!-- security test -->
- <target name="_jars-security">
+ <target name="_jars-security" depends="init">
<mkdir dir="${build.lib}"/>
<!-- caller-info.jar -->
@@ -102,9 +102,7 @@
<fileset dir="${build.resources}/security-srp">
<include name="users.properties"/>
</fileset>
- <fileset dir="${jboss.varia.lib}">
- <include name="jboss-srp.jar"/>
- </fileset>
+ <fileset refid="org.jboss.jbossas:jboss-as-varia:jar:jboss-srp"/>
</jar>
<jar destfile="${build.lib}/security-srp.jar">
More information about the jboss-cvs-commits
mailing list