|
From: Bill B. <pat...@us...> - 2003-08-30 00:29:23
|
User: patriot1burke
Date: 03/08/29 17:29:20
Modified: . build.xml
Log:
aop testsuite integration
Revision Changes Path
1.287 +200 -1 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- build.xml 27 Aug 2003 04:32:45 -0000 1.286
+++ build.xml 30 Aug 2003 00:29:20 -0000 1.287
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.286 2003/08/27 04:32:45 patriot1burke Exp $ -->
+<!-- $Id: build.xml,v 1.287 2003/08/30 00:29:20 patriot1burke Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -97,6 +97,7 @@
<path refid="junit.junit.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
<path refid="junitejb.junitejb.classpath"/>
+ <path refid="jdom.classpath"/>
<!-- needed for JBossMQ selector tests -->
<path refid="gnu.regexp.classpath"/>
@@ -137,6 +138,10 @@
<path refid="jboss.management.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aspects.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+
</path>
<!-- ===== -->
@@ -848,6 +853,86 @@
destdir="${build.resources}/entity/entity/META-INF"/>
</ejbdoclet>
+ <!-- aop test -->
+ <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/simpleejb/SimpleBean.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <deploymentdescriptor xmlencoding="UTF-8"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/aop/simpleejb/META-INF"/>
+ </ejbdoclet>
+
+ <!-- aop xdoclet test - ->
+ <taskdef name="aopdoclet"
+ classname="xdoclet.modules.jboss.aop.JBossAopTask"
+ classpathref="tests.classpath"/>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Advised">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Advised.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/ClassMetaData">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/ClassMetaData.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Intercepted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Intercepted.java"/>
+ <include name="org/jboss/test/aop/xdoclet/BasicInterceptor.java"/>
+ <include name="org/jboss/test/aop/xdoclet/XmlLoadingInterceptor.java"/>
+ <include name="org/jboss/test/aop/xdoclet/XmlInterceptorFactory.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/NewIntercepted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/NewIntercepted.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Introduced">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Introduced.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/NotAdvised">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/NotAdvised.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Secured">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Secured.java"/>
+ </fileset>
+ <configParam name="RunAs" value="Andy"/>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Stack">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Stack.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+ <aopdoclet destdir="${build.resources}/aop/xdoclet/Transacted">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/aop/xdoclet/Transacted.java"/>
+ </fileset>
+ <jbossaop/>
+ </aopdoclet>
+-->
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
@@ -1012,6 +1097,7 @@
_jars-jsr77,
_jars-foedeployer,
_jars-jbossmx,
+ _jars-aop,
_jars-ejbconf,
_jars-proxycompiler,
_jars-helloiiop,
@@ -3829,6 +3915,119 @@
</jar>
</target>
+ <!-- aop test -->
+ <target name="_jars-aop">
+ <!-- <mkdir dir="${build.lib}"/> -->
+ <!-- build aopest.jar -->
+ <jar jarfile="${build.lib}/aoptest.jar"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.client.classes"/>
+ <include name="org/jboss/test/aop/test/**"/>
+ <include name="org/somepackage/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="*.*"/>
+ </fileset>
+ </jar>
+
+ <!-- build simpleejb.jar -->
+ <jar jarfile="${build.lib}/simpleejb.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/simpleejb/"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/simpleejb/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-call-logging.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/CallLoggingUnitTestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/aop/calllogging/META-INF/"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/aop-invocationlog.aop">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/test/InvocationLogUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/bean/POJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${build.lib}/aop-invocationlog.sar">
+ <fileset dir="${build.lib}">
+ <include name="aop-invocationlog.aop"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop/invocationlog">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/aoptest.aop"
+ manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/Person.class"/>
+ <include name="org/jboss/test/aop/bean/Address.class"/>
+ <include name="org/jboss/test/aop/bean/NoInterceptorsPOJO*.class"/>
+ <include name="org/jboss/test/aop/bean/NonadvisedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SecuredPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SomeException.class"/>
+ <include name="org/jboss/test/aop/bean/POJO*.class"/>
+ <include name="org/jboss/test/aop/bean/Call*.class"/>
+ <include name="org/jboss/test/aop/bean/SomeIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/SubclassIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/AnotherIntroduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction.class"/>
+ <include name="org/jboss/test/aop/bean/Introduction2.class"/>
+ <include name="org/jboss/test/aop/bean/InterfaceMixin.class"/>
+ <include name="org/jboss/test/aop/bean/TxPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedPOJO.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleInterceptorFactory.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/SimpleBeanInterceptorFactory.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- build aop.jar -->
+ <jar jarfile="${build.lib}/aoptest.sar">
+ <fileset dir="${build.lib}">
+ <include name="aoptest.aop"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/aop/bean/AOPTester.class"/>
+ <include name="org/jboss/test/aop/bean/AOPTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTester.class"/>
+ <include name="org/jboss/test/aop/bean/RemotingTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTester.class"/>
+ <include name="org/jboss/test/aop/bean/SecurityTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTester.class"/>
+ <include name="org/jboss/test/aop/bean/TxLockTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTester.class"/>
+ <include name="org/jboss/test/aop/bean/VersionedObjectTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTester.class"/>
+ <include name="org/jboss/test/aop/bean/CacheTesterMBean.class"/>
+ <include name="org/jboss/test/aop/bean/BeforeInterceptor.class"/>
+ <include name="org/jboss/test/aop/bean/AfterInterceptor.class"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ </fileset>
+ <fileset dir="${build.resources}/aop">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ </target>
<!-- entity test -->
<target name="_jars-entity">
<mkdir dir="${build.lib}"/>
|