[jboss-cvs] JBossAS SVN: r65889 - in trunk/testsuite: imports and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 5 10:15:47 EDT 2007
Author: adrian at jboss.org
Date: 2007-10-05 10:15:46 -0400 (Fri, 05 Oct 2007)
New Revision: 65889
Removed:
trunk/testsuite/imports/sections/dtm.xml
trunk/testsuite/imports/sections/recover.xml
trunk/testsuite/src/main/org/jboss/test/dtm/
trunk/testsuite/src/main/org/jboss/test/dtmusertx/
trunk/testsuite/src/main/org/jboss/test/recover/
trunk/testsuite/src/resources/dtm/
trunk/testsuite/src/resources/dtmusertx/
trunk/testsuite/src/resources/recover/
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/imports/test-jars.xml
Log:
[JBAS-4520] - complete the removal of the dtm and recover tests
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-10-05 14:00:00 UTC (rev 65888)
+++ trunk/testsuite/build.xml 2007-10-05 14:15:46 UTC (rev 65889)
@@ -753,9 +753,6 @@
<patternset id="tomcat.webctx.includes">
<include name="org/jboss/test/web/test/WebCtxLoaderTestCase.class"/>
</patternset>
- <patternset id="dtm.excludes">
- <exclude name="org/jboss/test/dtm/**"/>
- </patternset>
<!-- ws-bpel integration tests -->
<patternset id="jbpm-bpel.includes">
<include name="org/jboss/test/bpel/**/*TestCase.class"/>
@@ -817,7 +814,6 @@
<patternset refid="deployment-service.excludes"/>
<patternset refid="compatibility.excludes"/>
<patternset refid="binding-manager.excludes"/>
- <patternset refid="dtm.excludes"/>
<patternset refid="jbossmq.excludes"/>
</patternset>
Deleted: trunk/testsuite/imports/sections/dtm.xml
===================================================================
--- trunk/testsuite/imports/sections/dtm.xml 2007-10-05 14:00:00 UTC (rev 65888)
+++ trunk/testsuite/imports/sections/dtm.xml 2007-10-05 14:15:46 UTC (rev 65889)
@@ -1,300 +0,0 @@
-<project name="tests-dtm-jars">
- <!-- dtm test -->
- <target name="_jars-dtm">
- <mkdir dir="${build.lib}"/>
-
- <!-- build dtmtest.jar -->
- <jar destfile="${build.lib}/dtmtest.jar"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <patternset refid="common.test.client.classes"/>
- <include name="org/jboss/test/dtm/interfaces/**"/>
- <include name="org/jboss/test/dtm/test/**"/>
- </fileset>
- <fileset dir="${build.resources}/dtm">
- <include name="*.*"/>
- </fileset>
- </jar>
-
- <!-- build dtmfrontend.jar -->
- <copy todir="${build.resources}/dtm/frontend/META-INF" overwrite="true"
- file="${source.resources}/dtm/frontend/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmfrontend.jar">
- <metainf dir="${build.resources}/dtm/frontend/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccount.jar -->
- <jar destfile="${build.lib}/dtmaccount.jar">
- <metainf dir="${build.resources}/dtm/account/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/AccountSessionBean*"/>
- </fileset>
- </jar>
-
- <!-- build dtmfrontend2entities.jar -->
- <copy todir="${build.resources}/dtm/frontend2entities/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/frontend2entities/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmfrontend2entities.jar">
- <metainf dir="${build.resources}/dtm/frontend2entities/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccountentity-derby.jar -->
- <copy todir="${build.resources}/dtm/accountentity/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/accountentity/META-INF/jbosscmp-jdbc.xml">
- <filterset>
- <filter token="DATASOURCE" value="XADerbyDS"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmaccountentity-derby.jar">
- <metainf dir="${build.resources}/dtm/accountentity/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/AccountEntityBean*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccountentity-oracle.jar -->
- <copy todir="${build.resources}/dtm/accountentity/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/accountentity/META-INF/jbosscmp-jdbc.xml">
- <filterset>
- <filter token="DATASOURCE" value="XAOracleDS"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmaccountentity-oracle.jar">
- <metainf dir="${build.resources}/dtm/accountentity/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/AccountEntityBean*"/>
- </fileset>
- </jar>
-
- <!-- build dtmfrontendiiop.jar -->
- <copy todir="${build.resources}/dtm/frontendiiop/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/frontendiiop/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmfrontendiiop.jar">
- <metainf dir="${build.resources}/dtm/frontendiiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccountiiop.jar -->
- <jar destfile="${build.lib}/dtmaccountiiop.jar">
- <metainf dir="${build.resources}/dtm/accountiiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/Account*"/>
- </fileset>
- </jar>
-
- <!-- build dtmfrontend2entitiesiiop.jar -->
- <copy todir="${build.resources}/dtm/frontend2entitiesiiop/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/frontend2entitiesiiop/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmfrontend2entitiesiiop.jar">
- <metainf
- dir="${build.resources}/dtm/frontend2entitiesiiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccountentityiiop-derby.jar -->
- <copy todir="${build.resources}/dtm/accountentityiiop/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/accountentityiiop/META-INF/jbosscmp-jdbc.xml">
- <filterset>
- <filter token="DATASOURCE" value="XADerbyDS"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmaccountentityiiop-derby.jar">
- <metainf dir="${build.resources}/dtm/accountentityiiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/AccountEntityBean*"/>
- </fileset>
- </jar>
-
- <!-- build dtmaccountentityiiop-oracle.jar -->
- <copy todir="${build.resources}/dtm/accountentityiiop/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/accountentityiiop/META-INF/jbosscmp-jdbc.xml">
- <filterset>
- <filter token="DATASOURCE" value="XAOracleDS"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmaccountentityiiop-oracle.jar">
- <metainf dir="${build.resources}/dtm/accountentityiiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/Account*"/>
- <include name="org/jboss/test/dtm/ejb/AccountEntityBean*"/>
- </fileset>
- </jar>
-
- <!-- build dtmotsfrontend.jar -->
- <copy todir="${build.resources}/dtm/frontendtomixed/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/frontendtomixed/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmotsfrontend.jar">
- <metainf dir="${build.resources}/dtm/frontendtomixed/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build otsdtmfrontendiiop.jar -->
- <copy todir="${build.resources}/dtm/frontendtomixediiop/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/frontendtomixediiop/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/otsdtmfrontendiiop.jar">
- <metainf dir="${build.resources}/dtm/frontendtomixediiop/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/FrontEnd*"/>
- </fileset>
- </jar>
-
- <!-- build dtmpassthrough2dtm.jar -->
- <copy todir="${build.resources}/dtm/passthrough2dtm/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/passthrough2dtm/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmpassthrough2dtm.jar">
- <metainf dir="${build.resources}/dtm/passthrough2dtm/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/PassThrough*"/>
- </fileset>
- </jar>
-
- <!-- build dtmpassthrough2ots.jar -->
- <copy todir="${build.resources}/dtm/passthrough2ots/META-INF"
- overwrite="true"
- file="${source.resources}/dtm/passthrough2ots/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST1" value="${env.MYTESTIP_2}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmpassthrough2ots.jar">
- <metainf dir="${build.resources}/dtm/passthrough2ots/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/PassThrough*"/>
- </fileset>
- </jar>
-
- <!-- build dtmworker.jar -->
- <copy todir="${build.resources}/dtm/worker/META-INF" overwrite="true"
- file="${source.resources}/dtm/worker/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/dtmworker.jar">
- <metainf dir="${build.resources}/dtm/worker/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtm/interfaces/*"/>
- <include name="org/jboss/test/dtm/ejb/Worker*"/>
- </fileset>
- </jar>
- </target>
-
- <!-- dtm usertx test -->
- <target name="_jars-dtmusertx">
- <mkdir dir="${build.lib}"/>
-
- <!-- build dtmusertxtest.jar -->
- <jar destfile="${build.lib}/dtmusertxtest.jar"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <patternset refid="common.test.client.classes"/>
- <include name="org/jboss/test/dtmusertx/interfaces/**"/>
- <include name="org/jboss/test/dtmusertx/test/**"/>
- </fileset>
- <fileset dir="${build.resources}/dtmusertx">
- <include name="*.*"/>
- </fileset>
- </jar>
-
- <!-- build dtmusertx.jar -->
- <jar destfile="${build.lib}/dtmusertx.jar">
- <metainf dir="${build.resources}/dtmusertx/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/dtmusertx/interfaces/**"/>
- <include name="org/jboss/test/dtmusertx/ejb/**"/>
- </fileset>
- </jar>
- </target>
-</project>
Deleted: trunk/testsuite/imports/sections/recover.xml
===================================================================
--- trunk/testsuite/imports/sections/recover.xml 2007-10-05 14:00:00 UTC (rev 65888)
+++ trunk/testsuite/imports/sections/recover.xml 2007-10-05 14:15:46 UTC (rev 65889)
@@ -1,155 +0,0 @@
-<project name="tests-recover-jars">
- <!-- recovery test -->
- <target name="_jars-recover">
- <mkdir dir="${build.lib}"/>
-
- <!-- build recoveroracletest.jar -->
- <jar destfile="${build.lib}/recoveroracletest.jar"
- manifest="${build.etc}/manifest.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/recover/bean/**"/>
- <include name="org/jboss/test/recover/oracle/**"/>
- <include name="org/jboss/test/recover/interfaces/**"/>
- </fileset>
- <fileset dir="${build.resources}/recover">
- <include name="oracle-xa-ds.xml"/>
- </fileset>
- </jar>
-
- <!-- build recovertest.jar -->
- <jar destfile="${build.lib}/recovertest.jar">
- <fileset dir="${build.classes}">
- <patternset refid="common.test.client.classes"/>
- <include name="org/jboss/test/aop/test/AOPTestSetup.class"/>
- <include
- name="org/jboss/test/recover/test/RemoteDummyXAResourceTestCase.class"/>
- </fileset>
- <fileset dir="${build.resources}/recover">
- <include name="*.*"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/recovertest.sar">
- <fileset dir="${build.classes}">
- <include
- name="org/jboss/test/recover/interfaces/RemoteDummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyXAResource.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/bean/RemoteDummyRecoverableFactory.class"/>
- <include
- name="org/jboss/test/recover/bean/RemoteDummyRecoverableFactoryMBean.class"/>
- </fileset>
- <fileset dir="${build.resources}/recover">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/recover-dummyrecoverable.sar">
- <fileset dir="${build.classes}">
- <include
- name="org/jboss/test/recover/bean/RemoteDummyRecoverableServiceMBean.class"/>
- <include
- name="org/jboss/test/recover/bean/RemoteDummyRecoverableService.class"/>
- <include
- name="org/jboss/test/recover/interfaces/RemoteDummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyXAResource.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyXAResourceImpl.class"/>
- <include
- name="org/jboss/test/recover/bean/DummyRecoverableProxyService$XAResourceWrapper.class"/>
- </fileset>
- <fileset dir="${build.resources}/recover/dummyrecoverable">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/recover-dummyrecoverableproxy.jar">
- <fileset dir="${build.classes}">
- <include
- name="org/jboss/test/recover/bean/DummyRecoverableProxyService*.class"/>
- <include
- name="org/jboss/test/recover/interfaces/RemoteDummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyRecoverable.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyXAResource.class"/>
- <include
- name="org/jboss/test/recover/interfaces/DummyXAResourceImpl.class"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/recover-stateless.ejb3">
- <fileset dir="${build.classes}">
- <include
- name="org/jboss/test/recover/bean/StatelessFooBean.class"/>
- <include
- name="org/jboss/test/recover/interfaces/StatelessFoo.class"/>
- </fileset>
- <fileset dir="${build.resources}/recover/stateless">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
- </fileset>
- </jar>
-
- <jar destfile="${build.lib}/recover-loggerwrapper.jar">
- <fileset dir="${build.classes}">
- <include
- name="org/jboss/test/recover/interfaces/MockLogger.class"/>
- <include
- name="org/jboss/test/recover/bean/MockLoggerServiceMBean.class"/>
- <include
- name="org/jboss/test/recover/bean/MockLoggerService.class"/>
- </fileset>
- </jar>
-
- <!-- build recover-xaresenlister.ejb3 -->
- <jar destfile="${build.lib}/recover-xaresenlister.jar">
- <metainf
- dir="${build.resources}/recover/xaresourceenlister/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlisterHome.class"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlister.class"/>
- <include
- name="org/jboss/test/recover/bean/XAResourceEnlisterBean.class"/>
- </fileset>
- </jar>
-
- <!-- build recover-xaresenlistercaller.ejb3 -->
- <copy
- todir="${build.resources}/recover/xaresourceenlistercaller/META-INF"
- overwrite="true"
- file="${source.resources}/recover/xaresourceenlistercaller/META-INF/jboss.xml">
- <filterset>
- <filter token="HOST2" value="${env.MYTESTIP_3}"/>
- <filter token="HOST3" value="${env.MYTESTIP_4}"/>
- </filterset>
- </copy>
- <jar destfile="${build.lib}/recover-xaresenlistercaller.jar">
- <metainf
- dir="${build.resources}/recover/xaresourceenlistercaller/META-INF"/>
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlisterCallerHome.class"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlisterCaller.class"/>
- <include
- name="org/jboss/test/recover/bean/XAResourceEnlisterCallerBean.class"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlisterHome.class"/>
- <include
- name="org/jboss/test/recover/interfaces/XAResourceEnlister.class"/>
- </fileset>
- </jar>
-
- </target>
-</project>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2007-10-05 14:00:00 UTC (rev 65888)
+++ trunk/testsuite/imports/server-config.xml 2007-10-05 14:15:46 UTC (rev 65889)
@@ -595,16 +595,6 @@
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
<sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
</server>
- <server name="dtm0" host="${node0}"/>
- <server name="dtm1" host="${node1}"/>
- <server name="dtm2" host="${node2}"/>
- <server name="dtm3" host="${node3}">
- <sysproperty key="oracle.jdbc.Trace" value="true"/>
- </server>
- <server name="root-coordinator" host="${node0}"/>
- <server name="xa-resource-manager" host="${node1}"/>
- <server name="subordinate-coordinator-1" host="${node2}"/>
- <server name="subordinate-coordinator-2" host="${node3}"/>
<server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
@@ -865,92 +855,6 @@
</sequential>
</macrodef>
-
- <!-- Macro for creating a test config with DTM and CORBA OTS -->
- <macrodef name="create-dtm-config"
- description="Create a simplified DTM/OTS configuration">
- <attribute name="conf"/>
- <sequential>
- <delete dir="${jboss.dist}/server/@{conf}" failonerror="false"/>
- <!-- Create a trimmed down default config -->
- <create-config baseconf="default" newconf="@{conf}">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-jdbc-metadata.sar"/>
- <include name="deploy/jboss-xa-jdbc.rar"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
- <!-- Copy jndi.properties from the all config -->
- <copy todir="${jboss.dist}/server/@{conf}/conf"
- file="${jboss.dist}/server/all/conf/jndi.properties"
- filtering="false" overwrite="true"/>
- <!-- Copy IIOP support from the all config -->
- <copy todir="${jboss.dist}/server/@{conf}/lib" overwrite="true">
- <fileset dir="${jboss.dist}/server/all/lib">
- <include name="avalon-framework.jar"/>
- <include name="jacorb.jar"/>
- <include name="jboss-iiop.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/@{conf}/conf" overwrite="true"
- file="${jboss.dist}/server/all/conf/jacorb.properties"/>
- <copy todir="${jboss.dist}/server/@{conf}/deploy" overwrite="true"
- file="${jboss.dist}/server/all/deploy/iiop-service.xml"/>
- </sequential>
- </macrodef>
-
- <!-- Macro for creating a test config with EJB3, DTM, and CORBA OTS -->
- <macrodef name="create-ejb3-dtm-config"
- description="Create a simplified DTM/OTS configuration">
- <attribute name="conf"/>
- <sequential>
- <delete dir="${jboss.dist}/server/@{conf}" failonerror="false"/>
- <!-- Create a trimmed down default config -->
- <create-config baseconf="default" newconf="@{conf}">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/jbossweb*.sar/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/ear-deployer.xml"/>
- <include name="deploy/jboss-aop-jdk50.deployer/"/>
- <include name="deploy/ejb3.deployer/"/>
- <include name="deploy/ejb3-interceptors-aop.xml/"/>
- <include name="deploy/ejb-deployer.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossjca-service.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-xa-jdbc.rar"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
- <!-- Copy jndi.properties from the all config -->
- <copy todir="${jboss.dist}/server/@{conf}/conf"
- file="${jboss.dist}/server/all/conf/jndi.properties"
- filtering="false" overwrite="true"/>
- <!-- Copy IIOP support from the all config -->
- <copy todir="${jboss.dist}/server/@{conf}/lib" overwrite="true">
- <fileset dir="${jboss.dist}/server/all/lib">
- <include name="avalon-framework.jar"/>
- <include name="jacorb.jar"/>
- <include name="jboss-iiop.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss.dist}/server/@{conf}/conf" overwrite="true"
- file="${jboss.dist}/server/all/conf/jacorb.properties"/>
- <copy todir="${jboss.dist}/server/@{conf}/deploy" overwrite="true"
- file="${jboss.dist}/server/all/deploy/iiop-service.xml"/>
- </sequential>
- </macrodef>
-
-
<!-- This macro makes a new config whose name is given by the newconf
attribute by copying the config given by the baseconf. The content that
is copied from baseconf is limited to the patternset nested element. In
Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2007-10-05 14:00:00 UTC (rev 65888)
+++ trunk/testsuite/imports/test-jars.xml 2007-10-05 14:15:46 UTC (rev 65889)
@@ -20,7 +20,6 @@
<import file="sections/dbtest.xml"/>
<import file="sections/deadlock.xml"/>
<import file="sections/deployers.xml"/>
- <import file="sections/dtm.xml"/>
<import file="sections/ejbconf.xml"/>
<import file="sections/entity.xml"/>
<import file="sections/exception.xml"/>
@@ -54,7 +53,6 @@
<import file="sections/pooled.xml"/>
<import file="sections/proxycompiler.xml"/>
<import file="sections/readahead.xml"/>
- <import file="sections/recover.xml"/>
<import file="sections/retry.xml"/>
<import file="sections/scoped.xml"/>
<import file="sections/security.xml"/>
@@ -96,8 +94,6 @@
_jars-deadlock,
_jars-deployers,
_jars-deployment,
- _jars-dtm,
- _jars-dtmusertx,
_jars-ejbconf,
_jars-entity,
_jars-entitydepends,
@@ -139,7 +135,6 @@
_jars-pooled,
_jars-proxycompiler,
_jars-readahead,
- _jars-recover,
_jars-retry,
_jars-scoped,
_jars-security,
More information about the jboss-cvs-commits
mailing list