[jboss-cvs] JBossAS SVN: r92078 - in trunk: build and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 6 14:07:12 EDT 2009
Author: pgier
Date: 2009-08-06 14:07:12 -0400 (Thu, 06 Aug 2009)
New Revision: 92078
Modified:
trunk/build/pom.xml
trunk/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/classloader.xml
trunk/testsuite/imports/sections/cluster.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 17:34:30 UTC (rev 92077)
+++ trunk/build/pom.xml 2009-08-06 18:07:12 UTC (rev 92078)
@@ -25,6 +25,11 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <classifier>jboss-aspect-library</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-cluster</artifactId>
</dependency>
<dependency>
@@ -41,10 +46,20 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <classifier>jboss-jsr88</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-hibernate-int</artifactId>
</dependency>
<dependency>
@@ -101,6 +116,16 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-service</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-deployer</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-varia</artifactId>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-08-06 17:34:30 UTC (rev 92077)
+++ trunk/pom.xml 2009-08-06 18:07:12 UTC (rev 92078)
@@ -233,6 +233,12 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <classifier>jboss-aspect-library</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-cluster</artifactId>
<version>${project.version}</version>
</dependency>
@@ -259,6 +265,12 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-jsr88</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${project.version}</version>
</dependency>
@@ -393,6 +405,18 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-service</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-deployer</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-varia</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-08-06 17:34:30 UTC (rev 92077)
+++ trunk/testsuite/build.xml 2009-08-06 18:07:12 UTC (rev 92078)
@@ -196,6 +196,15 @@
<fileset refid="org.springframework:spring-web:jar"/>
<fileset refid="org.springframework:spring-webmvc:jar"/>
</path>
+ <path id="org.jboss.jbossas.tomcat.classpath">
+ <fileset refid="org.jboss.jbossas:jboss-as-tomcat:jar:jboss-web-deployer"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-tomcat:jar:jboss-web-service"/>
+ <pathelement path="${project.root}/tomcat/target/jbossweb-cluster.aop"/>
+ <pathelement path="${project.root}/tomcat//target/resource"/>
+ </path>
+ <path id="org.jboss.jbossas.cluster.resources">
+ <pathelement path="${project.root}/cluster/target/resources"/>
+ </path>
<!-- The combined library classpath -->
<path id="library.classpath">
@@ -357,15 +366,17 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.aspects.classpath"/>
- <path refid="jboss.cluster.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-aspects:jar:jboss-aspect-library"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-cluster:jar"/>
+ <path refid="org.jboss.jbossas.cluster.resources"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
- <path refid="jboss.deployment.classpath"/>
+ <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"/>
- <path refid="jboss.iiop.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
<path refid="jboss.internal-server.classpath"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
@@ -388,7 +399,7 @@
<fileset refid="org.jboss.security:jbosssx:jar"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.main.classpath"/>
+ <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"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar"/>
@@ -398,7 +409,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
- <path refid="jboss.tomcat.classpath"/>
+ <path refid="org.jboss.jbossas.tomcat.classpath"/>
<path refid="jboss.varia.classpath"/>
<fileset refid="jboss.web:el-api:jar"/>
<fileset refid="jboss.web:jasper-jdt:jar"/>
@@ -428,10 +439,11 @@
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
+ <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.test:jboss-test:jar"/>
- <path refid="jboss.tomcat.classpath"/>
+ <path refid="org.jboss.jbossas.tomcat.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -447,7 +459,8 @@
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.ejb3.classpath"/>
+ <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.test:jboss-test:jar"/>
<path refid="thirdparty.classpath"/>
@@ -547,7 +560,7 @@
-->
<maven:dependencies filesetId="pom.dependencies"
versionsId="pom.dependencies.versions"
- scopes="compile, runtime, test" type="pom, jar, zip, war"
+ scopes="compile, runtime, test"
addArtifactFileSetRefs="true"
cacheDependencyRefs="true"
dependencyRefsBuildFile="output/build-dependencies.xml">
@@ -558,15 +571,6 @@
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${pom.dependencies.versions}" to="flatten" />
- <!-- Due to MANTTASKS-148 files with jboss-sar packaging cannot be resolved directly in the pom -->
- <xmlproperty file="../component-matrix/pom.xml" prefix="component-matrix"/>
- <maven:dependencies addArtifactFileSetRefs="true">
- <dependency groupId="jboss.jbossts" artifactId="jbossts-tools"
- 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>
-
<property name="init-dependencies.target.complete" value="true"/>
</target>
@@ -2591,7 +2595,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
</classpath>
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3361,7 +3365,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
</classpath>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2009-08-06 17:34:30 UTC (rev 92077)
+++ trunk/testsuite/imports/sections/classloader.xml 2009-08-06 18:07:12 UTC (rev 92078)
@@ -519,11 +519,11 @@
<aopc compilerclasspathref="aop.task.classpath" verbose="true">
<classpath refid="thirdparty.classpath"/>
<classpath path="${build.classes}"/>
- <classpath refid="jboss.tomcat.classpath"/>
+ <classpath refid="org.jboss.jbossas.tomcat.classpath"/>
<src path="${build.classes}"/>
<include name="org/jboss/test/classloader/leak/aop/*"/>
<!--aoppath The needed aop.xml file is picked up from the
- jbossweb-cluster.aop jar via jboss.tomcat.classpath -->
+ jbossweb-cluster.aop jar via org.jboss.jbossas.tomcat.classpath -->
</aopc>
<war destfile="${build.lib}/classloader-leak-nocache-replicable.war"
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2009-08-06 17:34:30 UTC (rev 92077)
+++ trunk/testsuite/imports/sections/cluster.xml 2009-08-06 18:07:12 UTC (rev 92078)
@@ -302,7 +302,7 @@
classpathref="org.jboss.aop.classpath"/>
<annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
<classpath refid="thirdparty.classpath"/>
- <classpath refid="jboss.tomcat.classpath"/>
+ <classpath refid="org.jboss.jbossas.tomcat.classpath"/>
<classpath path="${build.classes}"/>
<src path="${source.java}"/>
<include name="org/jboss/test/cluster/web/aop/**"/>
@@ -319,11 +319,11 @@
<classpath refid="jboss.aspects.classpath"/>
-->
<classpath path="${build.classes}"/>
- <classpath refid="jboss.tomcat.classpath"/>
+ <classpath refid="org.jboss.jbossas.tomcat.classpath"/>
<src path="${build.classes}"/>
<include name="org/jboss/test/cluster/**/web/aop/*"/>
<!--aoppath The needed aop.xml file is picked up from the
- jbossweb-cluster.aop jar via jboss.tomcat.classpath -->
+ jbossweb-cluster.aop jar via org.jboss.jbossas.tomcat.classpath -->
</aopc>
<!-- build http-scoped-field.war -->
More information about the jboss-cvs-commits
mailing list