|
From: Julien V. <vi...@us...> - 2004-09-11 21:47:55
|
User: vietj
Date: 04/09/11 14:47:44
Modified: . build.xml
Log:
Added an optional attribute "interface" on the mbean element in jboss-service.xml. This enable to specify the full qualified name of an interface used to create the management interface of the MBean. It uses the javax.management.StandardMBean introduced in JMX 1.2
Revision Changes Path
1.406 +61 -51 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- build.xml 11 Sep 2004 16:30:07 -0000 1.405
+++ build.xml 11 Sep 2004 21:47:43 -0000 1.406
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.405 2004/09/11 16:30:07 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.406 2004/09/11 21:47:43 vietj Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -78,7 +78,7 @@
<property name="module.Name" value="JBoss Testsuite"/>
<property name="module.version" value="DEV"/>
- <!-- ============================= -->
+ <!-- ============================= -->
<!-- Folders excluded from compile -->
<!-- ============================= -->
<property name="javac.excludes">org/jboss/test/media/**</property>
@@ -112,12 +112,12 @@
<!-- needed for proxy tests -->
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
- <path refid="hsqldb.hsqldb.classpath"/>
-
- <!-- Need hibernate jar for hibernate-based tests -->
- <path refid="hibernate2.classpath"/>
- <path refid="odmg.classpath"/>
- <path refid="cglib.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
+
+ <!-- Need hibernate jar for hibernate-based tests -->
+ <path refid="hibernate2.classpath"/>
+ <path refid="odmg.classpath"/>
+ <path refid="cglib.classpath"/>
</path>
<!-- ======= -->
@@ -159,7 +159,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.webservice.classpath"/>
+ <path refid="jboss.webservice.classpath"/>
</path>
<!-- ===== -->
@@ -1269,7 +1269,7 @@
<include name="**/*"/>
</fileset>
</copy>
- <!-- we copy the standard client-config to the resources folder
+ <!-- we copy the standard client-config to the resources folder
<copy todir="${build.resources}" filtering="no">
<fileset dir="${jboss.jbossnet.etc}">
<include name="**/client-config.xml"/>
@@ -2275,7 +2275,7 @@
</metainf>
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/scoping/naming/service/*"/>
- </fileset>
+ </fileset>
</jar>
<war destfile="${build.lib}/shared-jndi.war"
webxml="${build.resources}/classloader/scoping/naming/xml/web.xml">
@@ -3144,36 +3144,36 @@
</target>
<!-- hibernate tests -->
- <target name="_jars-hibernate">
- <mkdir dir="${build.lib}"/>
+ <target name="_jars-hibernate">
+ <mkdir dir="${build.lib}"/>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test.har">
+ <metainf dir="${source.resources}/hibernate/mappings">
+ <include name="*"/>
+ </metainf>
+ <metainf dir="${source.resources}/hibernate/har-deployment">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/model/*"/>
+ </jar>
+
+ <jar basedir="${build.classes}" destfile="${build.lib}/hib-test-ejb.jar">
+ <metainf dir="${source.resources}/hibernate/ejb/META-INF">
+ <include name="*"/>
+ </metainf>
+ <include name="org/jboss/test/hibernate/ejb/**"/>
+ <include name="org/jboss/test/hibernate/ProfileService.class"/>
+ </jar>
- <jar basedir="${build.classes}" destfile="${build.lib}/hib-test.har">
- <metainf dir="${source.resources}/hibernate/mappings">
- <include name="*"/>
- </metainf>
- <metainf dir="${source.resources}/hibernate/har-deployment">
- <include name="*"/>
- </metainf>
- <include name="org/jboss/test/hibernate/model/*"/>
- </jar>
-
- <jar basedir="${build.classes}" destfile="${build.lib}/hib-test-ejb.jar">
- <metainf dir="${source.resources}/hibernate/ejb/META-INF">
- <include name="*"/>
- </metainf>
- <include name="org/jboss/test/hibernate/ejb/**"/>
- <include name="org/jboss/test/hibernate/ProfileService.class"/>
- </jar>
-
- <ear earfile="${build.lib}/hib-test.ear"
- appxml="${source.resources}/hibernate/ear/application.xml">
- <metainf dir="${source.resources}/hibernate/ear">
- <include name="jboss-app.xml" />
- </metainf>
- <fileset dir="${build.lib}">
- <include name="hib-test-ejb.jar" />
- <include name="hib-test.har" />
- </fileset>
+ <ear earfile="${build.lib}/hib-test.ear"
+ appxml="${source.resources}/hibernate/ear/application.xml">
+ <metainf dir="${source.resources}/hibernate/ear">
+ <include name="jboss-app.xml" />
+ </metainf>
+ <fileset dir="${build.lib}">
+ <include name="hib-test-ejb.jar" />
+ <include name="hib-test.har" />
+ </fileset>
</ear>
<war warfile="${build.lib}/hib-test.war" webxml="${source.resources}/hibernate/web/WEB-INF/web.xml">
@@ -4287,6 +4287,16 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
+
+ <!-- explicit standard interface sar -->
+ <jar jarfile="${build.lib}/explicit-standard-interface.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jmx/standard/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/jmx/standard">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
</target>
<!-- jrmp test -->
@@ -5663,7 +5673,7 @@
<include name="**/*.xml"/>
</fileset>
</jar>
- </target>
+ </target>
<!-- ================================================================== -->
@@ -5791,12 +5801,12 @@
<target name="tests-clustering-noreport"
depends="init, tests-clustering-unit,tests-http-clustering-unit">
</target>
-
+
<!-- HTTP Clustering Tests-->
<target name="tests-http-clustering-noreport"
depends="init, tests-http-clustering-unit">
</target>
-
+
<target name="tests-http-clustering" description="Execute clustering tests requiring two nodes."
depends="init, tests-http-clustering-noreport, tests-report-xml">
</target>
@@ -5980,7 +5990,7 @@
</batchtest>
</junit>
</target>
-
+
<!-- Test HTTP Clustering -->
<target name="tests-http-clustering-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
@@ -6007,10 +6017,10 @@
<antcall target="tests-http-cluster"> </antcall>
-->
</target>
-
+
<target name="shutdowninstance">
<echo>Shutting Down an Instance of JBoss Running</echo>
- <java classname="org.jboss.Shutdown" fork="yes" >
+ <java classname="org.jboss.Shutdown" fork="yes" >
<arg value="-s ${instanceport}"/>
<classpath>
<pathelement location="/Users/anil/jboss-head/build/output/jboss-4.0.0DR4/bin/shutdown.jar"/>
@@ -6018,8 +6028,8 @@
</classpath>
</java>
</target>
-
-
+
+
<target name="tests-http-cluster">
<echo>Calling tests-http-cluster</echo>
<junit dir="${module.output}"
@@ -6033,7 +6043,7 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-
+
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
@@ -6047,14 +6057,14 @@
haltonfailure="${junit.batchtest.haltonfailure}"
fork="${junit.batchtest.fork}">
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes}">
<!-- Following added by Anil -->
<include name="org/jboss/test/cluster/**/*UnitTestCase*.class"/>
</fileset>
</batchtest>
</junit>
</target>
-
+
<target name="tests-standalone-aop-unit" depends="maybejars">
<!--
|