[jboss-cvs] JBossAS SVN: r102782 - in trunk/testsuite: imports and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 23 09:11:42 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-03-23 09:11:41 -0400 (Tue, 23 Mar 2010)
New Revision: 102782
Removed:
trunk/testsuite/imports/sections/httpsessionreplication.xml
trunk/testsuite/src/main/org/jboss/test/cluster/cache/aop/
trunk/testsuite/src/main/org/jboss/test/cluster/cache/bean/
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/cache/test/
trunk/testsuite/src/resources/cluster/cache/META-INF/
trunk/testsuite/src/resources/cluster/cache/aop/META-INF/
trunk/testsuite/src/resources/cluster/cache/manifest.mf
trunk/testsuite/src/resources/cluster/cache/standaloneAop/META-INF/
trunk/testsuite/src/resources/cluster/cache/standaloneAop/log4j.xml
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/test-jars.xml
Log:
[JBAS-7848] Remove unused tests of unsupported invocation of JBC as an mbean
Some more trash can emptying re: httpsessionreplication tests
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/build.xml 2010-03-23 13:11:41 UTC (rev 102782)
@@ -1155,8 +1155,6 @@
<!-- JBAS-2026 -->
<exclude name="org/jboss/test/jmx/test/JarInSarJSR77UnitTestCase.class"/>
- <!-- Tests invoking JBossCache via MBean interface, which is no longer supported -->
- <exclude name="org/jboss/test/cluster/defaultcfg/cache/test/*"/>
<!-- JBAS-4548 -->
<exclude name="org/jboss/test/deployers/ear/test/EmbeddedDatasourceUnitTestCase.class"/>
<!-- JASPI needs revisiting -->
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/imports/sections/cluster.xml 2010-03-23 13:11:41 UTC (rev 102782)
@@ -948,6 +948,21 @@
<include name="cif-ds.xml"/>
</fileset-->
</ear>
+
+ <!-- ustxsticky.jar -->
+ <zip destfile="${build.lib}/ustxsticky.jar">
+ <zipfileset dir="${build.resources}/cluster/ejb2/ustxsticky"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/ejb2/ustxsticky/*"/>
+ </fileset>
+ </zip>
+
+ <zip destfile="${build.lib}/rspfilter.sar">
+ <zipfileset dir="${build.resources}/cluster/rspfilter"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/cluster/rspfilter/*"/>
+ </fileset>
+ </zip>
</target>
@@ -1034,21 +1049,6 @@
<metainf dir="${build.resources}/cache/aop/META-INF/"/>
</jar>
-->
-
- <!-- ustxsticky.jar -->
- <zip destfile="${build.lib}/ustxsticky.jar">
- <zipfileset dir="${build.resources}/cluster/ejb2/ustxsticky"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/ejb2/ustxsticky/*"/>
- </fileset>
- </zip>
-
- <zip destfile="${build.lib}/rspfilter.sar">
- <zipfileset dir="${build.resources}/cluster/rspfilter"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/cluster/rspfilter/*"/>
- </fileset>
- </zip>
</target>
</project>
Deleted: trunk/testsuite/imports/sections/httpsessionreplication.xml
===================================================================
--- trunk/testsuite/imports/sections/httpsessionreplication.xml 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/imports/sections/httpsessionreplication.xml 2010-03-23 13:11:41 UTC (rev 102782)
@@ -1,22 +0,0 @@
-<project name="tests-httpsessionreplication-jars">
- <!-- httpsessionreplication test -->
- <target name="_jars-httpsessionreplication">
- <mkdir dir="${build.lib}"/>
-
- <!-- build httpsessionreplication.jar -->
- <jar destfile="${build.lib}/httpsessionreplication.jar">
- <!--
- <fileset dir="${build.classes}">
- <patternset refid="jboss.test.util.ejb.set"/>
- <include name="org/jboss/test/testbean/interfaces/**"/>
- <include name="org/jboss/test/testbeancluster/interfaces/**"/>
- <include name="org/jboss/test/testbean/bean/**"/>
- <include name="org/jboss/test/testbeancluster/bean/**"/>
- </fileset>
- -->
- <fileset dir="${build.resources}/cluster">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
- </target>
-</project>
Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/imports/test-jars.xml 2010-03-23 13:11:41 UTC (rev 102782)
@@ -30,7 +30,6 @@
<import file="sections/exception.xml"/>
<import file="sections/hello.xml"/>
<import file="sections/hibernate.xml"/>
- <import file="sections/httpsessionreplication.xml"/>
<import file="sections/idgen.xml"/>
<import file="sections/iiop.xml"/>
<import file="sections/invokers.xml"/>
@@ -98,7 +97,6 @@
_jars-bench,
_jars-bmp,
_jars-bootstrapdependencies,
- _jars-cache,
_jars-classloader,
_jars-client,
_jars-cluster,
@@ -122,7 +120,6 @@
_jars-helloiiop,
_jars-hellojrmpiiop,
_jars-hibernate,
- _jars-httpsessionreplication,
_jars-idgen,
_jars-iiop,
_jars-iiopperf,
Deleted: trunk/testsuite/src/resources/cluster/cache/manifest.mf
===================================================================
--- trunk/testsuite/src/resources/cluster/cache/manifest.mf 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/src/resources/cluster/cache/manifest.mf 2010-03-23 13:11:41 UTC (rev 102782)
@@ -1 +0,0 @@
-Class-Path: ./lib/jboss-cache.jar
Deleted: trunk/testsuite/src/resources/cluster/cache/standaloneAop/log4j.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/cache/standaloneAop/log4j.xml 2010-03-23 13:07:24 UTC (rev 102781)
+++ trunk/testsuite/src/resources/cluster/cache/standaloneAop/log4j.xml 2010-03-23 13:11:41 UTC (rev 102782)
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="/tmp/test.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
- <param name="Threshold" value="DEBUG"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="FATAL"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Limit JBoss categories to INFO
- <category name="org.jboss">
- <priority value="INFO" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Increase the priority threshold for the DefaultDS category
- <category name="DefaultDS">
- <priority value="FATAL"/>
- </category>
- -->
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <category name="org.jboss.cache">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <category name="org.jboss.tm">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
More information about the jboss-cvs-commits
mailing list