[jboss-cvs] JBossAS SVN: r58115 - in trunk/testsuite/src/main/org/jboss/test: aop/test bankiiop/ejb bankiiop/test bench/servlet cache/test/aop classloader/circularity/test classloader/interrupt classloader/test cluster/drm cluster/ds cluster/test cluster/web cmp2/cmr/ejb cmp2/cmrstress/ejb cmp2/cmrtree/ejb cmp2/ejbselect cmp2/fkmapping/ejb cmp2/fkstackoverflow/ejb cmp2/idxandusersql/test cmp2/keygen/test cmp2/optimisticlock/ejb cmp2/perf/ejb cmp2/perf/interfaces cmp2/readonly cmp2/relationship/manyToManyBidirectional cmp2/relationship/manyToManyUnidirectional cmp2/relationship/manyToOneUnidirectional cmp2/relationship/oneToManyBidirectional cmp2/relationship/oneToManyUnidirectional cmp2/relationship/oneToOneBidirectional cmp2/relationship/oneToOneUnidirectional cmp2/simple cts/ejb cts/interfaces cts/jms cts/test deadlock/bean deadlock/test dtm/ejb dtmusertx/ejb entityexc/ejb hibernate/test invokers/ejb isolation/web/c jbossmessaging jbossmessaging/perf jbossmessaging/test jbos! smq jbossmq/perf jbossmq/test jbossmx/compliance/standard jbossmx/implementation/server jbossmx/implementation/server/support jbossmx/performance/dynamic jbossmx/performance/standard jca/bank/ejb jca/ejb jca/fs jca/test jmsra/bean jmx/loading jmx/nullinfo jmx/test jrmp/ejb load/test lock/bean lock/test marathon/test mdb/bean naming/ejb naming/test perf/ejb perf/interfaces pooled/test proxycompiler/test readahead/ejb recover/bean security/ejb security/ejb/project security/interceptors security/proxy security/test security/test/xacml security/test/xacml/modules securitymgr/ejb securitymgr/test stax testbean/bean testbean2/bean testbeancluster/bean testbeancluster/test testbyvalue/bean threading/ejb threading/mbean timer/ejb txiiop/ejb txtimer/ejb util/ejb util/test web/interfaces web/servlets web/test web/util xa/bean xa/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 4 03:45:02 EST 2006
Author: scott.stark at jboss.org
Date: 2006-11-04 03:42:14 -0500 (Sat, 04 Nov 2006)
New Revision: 58115
Modified:
trunk/testsuite/src/main/org/jboss/test/aop/test/AOPUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/JMXUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/RemotingUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/SecurityUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/TxLockUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/TxUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/VersionedObjectUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/bankiiop/ejb/TellerBean.java
trunk/testsuite/src/main/org/jboss/test/bankiiop/test/BankStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/bench/servlet/Dispatcher.java
trunk/testsuite/src/main/org/jboss/test/bench/servlet/EJBTester.java
trunk/testsuite/src/main/org/jboss/test/bench/servlet/FullTester.java
trunk/testsuite/src/main/org/jboss/test/bench/servlet/SimpleServlet.java
trunk/testsuite/src/main/org/jboss/test/cache/test/aop/LocalUnitAopTest.java
trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularLoadTests.java
trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests.java
trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests3.java
trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/DeadlockTests3.java
trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/RecursiveCCETests.java
trunk/testsuite/src/main/org/jboss/test/classloader/interrupt/TestThread.java
trunk/testsuite/src/main/org/jboss/test/classloader/test/BasicLoaderUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/drm/DRMUser.java
trunk/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java
trunk/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/StatefulSessionServlet.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/ejb/CMRBugManagerBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ChildBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ParentBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ABean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildEntityBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/keygen/test/KeyGenerationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/ejb/FacadeBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookEntryBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookMgrBean.java
trunk/testsuite/src/main/org/jboss/test/cmp2/perf/interfaces/LocalCheckBookEntry.java
trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java
trunk/testsuite/src/main/org/jboss/test/cmp2/simple/SimpleUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/BmpCallbackBean.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsBmpBean.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/cts/interfaces/UserTransactionTester.java
trunk/testsuite/src/main/org/jboss/test/cts/jms/ContainerMBox.java
trunk/testsuite/src/main/org/jboss/test/cts/jms/MsgSender.java
trunk/testsuite/src/main/org/jboss/test/cts/test/ClientCallbackImpl.java
trunk/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java
trunk/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
trunk/testsuite/src/main/org/jboss/test/deadlock/bean/EnterpriseEntityBean.java
trunk/testsuite/src/main/org/jboss/test/deadlock/bean/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/deadlock/test/BeanStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountEntityBean.java
trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountSessionBean.java
trunk/testsuite/src/main/org/jboss/test/dtm/ejb/FrontEndBean.java
trunk/testsuite/src/main/org/jboss/test/dtm/ejb/PassThroughBean.java
trunk/testsuite/src/main/org/jboss/test/dtm/ejb/WorkerBean.java
trunk/testsuite/src/main/org/jboss/test/dtmusertx/ejb/StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/entityexc/ejb/EntityExcBean.java
trunk/testsuite/src/main/org/jboss/test/hibernate/test/TimersUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/invokers/ejb/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/isolation/web/c/ContextListener.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/MQBase.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/JBossMQPerfStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/test/MessageBodyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/test/RollBackUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoUtil.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/support/ContextCL.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/dynamic/InvocationTestCase.java
trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/standard/InvocationTestCase.java
trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/AccountBean.java
trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/CustomerBean.java
trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/TellerBean.java
trunk/testsuite/src/main/org/jboss/test/jca/ejb/CachedConnectionSessionBean.java
trunk/testsuite/src/main/org/jboss/test/jca/fs/DirContextFactoryImpl.java
trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContext.java
trunk/testsuite/src/main/org/jboss/test/jca/test/CachedConnectionBankStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmsra/bean/PublisherBean.java
trunk/testsuite/src/main/org/jboss/test/jmsra/bean/QueueRecBean.java
trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicAdapter.java
trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicPublisherBean.java
trunk/testsuite/src/main/org/jboss/test/jmx/loading/ResourceTsts.java
trunk/testsuite/src/main/org/jboss/test/jmx/nullinfo/NullInfo.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/ListenerServiceMBeanUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/XMLAttributePersistenceManagerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jrmp/ejb/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/load/test/Worker.java
trunk/testsuite/src/main/org/jboss/test/lock/bean/EnterpriseEntityBean.java
trunk/testsuite/src/main/org/jboss/test/lock/test/EnterpriseEntityTest.java
trunk/testsuite/src/main/org/jboss/test/lock/test/SpinUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/marathon/test/BankMarathonTestCase.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/BMPBean.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/ExQueueBean.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/ObjectMessageBean.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/QueueBean.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/TXTimeOutBean.java
trunk/testsuite/src/main/org/jboss/test/mdb/bean/TopicBean.java
trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestENCBean.java
trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestEjbLinkBean.java
trunk/testsuite/src/main/org/jboss/test/naming/test/ImplUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/perf/ejb/ClientSessionBean.java
trunk/testsuite/src/main/org/jboss/test/perf/ejb/SessionBean.java
trunk/testsuite/src/main/org/jboss/test/perf/interfaces/EntityPK.java
trunk/testsuite/src/main/org/jboss/test/pooled/test/BeanStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/proxycompiler/test/ProxyCompilerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestEntity.java
trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestSession.java
trunk/testsuite/src/main/org/jboss/test/recover/bean/AccountBean.java
trunk/testsuite/src/main/org/jboss/test/recover/bean/FrontEndBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/CalleeBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerFacadeBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/CustomPrincipalBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/EntityBeanImpl.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/FacadeTargetBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/MissingMethodBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsMDB.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean2.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean3.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean4.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/UncheckedSessionBean.java
trunk/testsuite/src/main/org/jboss/test/security/ejb/project/ProjRepositoryBean.java
trunk/testsuite/src/main/org/jboss/test/security/interceptors/ClientEncryptionInterceptor.java
trunk/testsuite/src/main/org/jboss/test/security/proxy/ProjRepositorySecurityProxy2.java
trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/RoleMappingModuleUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/SRPLoginModuleUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/SRPUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/SecurityMgrStressTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/StatelessSessionClient.java
trunk/testsuite/src/main/org/jboss/test/security/test/XMLLoginModulesUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/test/xacml/XACMLUtil.java
trunk/testsuite/src/main/org/jboss/test/security/test/xacml/modules/TestRoleAttributeFinderModule.java
trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/BadBean.java
trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/IOStatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/securitymgr/test/PolicyUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/securitymgr/test/SecurityUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/stax/StaxTestCase.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatelessBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/EnterpriseEntityBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityBMPBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityPKBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/testbean/bean/TxSessionBean.java
trunk/testsuite/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java
trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/EntityPKBean.java
trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/SessionToEntityBean.java
trunk/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByReferenceStatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByValueStatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/RootStatelessSessionBean.java
trunk/testsuite/src/main/org/jboss/test/threading/ejb/EJBThreadsBean.java
trunk/testsuite/src/main/org/jboss/test/threading/mbean/Threads.java
trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSFSBean.java
trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSLSBean.java
trunk/testsuite/src/main/org/jboss/test/txiiop/ejb/StatefulSessionBean.java
trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerEntityBean.java
trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerFacadeBean.java
trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerSessionBean.java
trunk/testsuite/src/main/org/jboss/test/util/ejb/SessionSupport.java
trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolRunnableUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolTaskUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/web/interfaces/EntityPK.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/EJBOnStartupServlet.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/ENCServlet.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/SecureEJBServletMT.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/StatefulSessionServlet.java
trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
trunk/testsuite/src/main/org/jboss/test/web/util/Util.java
trunk/testsuite/src/main/org/jboss/test/xa/bean/XATestBean.java
trunk/testsuite/src/main/org/jboss/test/xa/test/XAUnitTestCase.java
Log:
Replace the explict log4j usage and update for changes to JBossTestCase
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/AOPUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/AOPUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/AOPUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class AOPUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/JMXUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/JMXUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/JMXUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -40,7 +40,7 @@
public class JMXUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/RemotingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/RemotingUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/RemotingUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,8 +27,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
-
+import org.jboss.logging.Logger;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.JBossTestCase;
import org.jboss.test.aop.bean.NonadvisedPOJO;
@@ -45,7 +44,7 @@
public class RemotingUnitTestCase
extends JBossTestCase
{
- Category log = getLog();
+ Logger log = getLog();
private ObjectName testerName = ObjectNameFactory.create("jboss.aop:name=RemotingTester");
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
public class ScopedUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/SecurityUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/SecurityUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/SecurityUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class SecurityUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/TxLockUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/TxLockUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/TxLockUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class TxLockUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/TxUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/TxUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/TxUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class TxUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/VersionedObjectUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/VersionedObjectUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/VersionedObjectUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class VersionedObjectUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/bankiiop/ejb/TellerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bankiiop/ejb/TellerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bankiiop/ejb/TellerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import org.jboss.test.util.ejb.SessionSupport;
import org.jboss.test.bankiiop.interfaces.*;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
@@ -55,7 +55,7 @@
{
try
{
- Category.getInstance(TellerBean.class.getName()).info("Invocation #"+invocations++);
+ Logger.getLogger(TellerBean.class.getName()).info("Invocation #"+invocations++);
from.withdraw(amount);
to.deposit(amount);
} catch (Exception e)
Modified: trunk/testsuite/src/main/org/jboss/test/bankiiop/test/BankStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bankiiop/test/BankStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bankiiop/test/BankStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.rmi.PortableRemoteObject;
import junit.framework.Test;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossIIOPTestCase;
import org.jboss.test.bankiiop.interfaces.Account;
import org.jboss.test.bankiiop.interfaces.AccountData;
@@ -210,7 +210,7 @@
{
public void run()
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
try
{
@@ -286,7 +286,7 @@
Thread.sleep(500); // Wait between each client
new Thread(new Runnable()
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
public void run()
{
Modified: trunk/testsuite/src/main/org/jboss/test/bench/servlet/Dispatcher.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bench/servlet/Dispatcher.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bench/servlet/Dispatcher.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,8 +33,8 @@
public class Dispatcher extends HttpServlet {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(Dispatcher.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(Dispatcher.class);
public static String[] params = {"hw", "os", "ram", "cpu", "jdk", "ejb", "web", "servlet" };
Modified: trunk/testsuite/src/main/org/jboss/test/bench/servlet/EJBTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bench/servlet/EJBTester.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bench/servlet/EJBTester.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class EJBTester {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
int maxClients;
Context ctx;
Modified: trunk/testsuite/src/main/org/jboss/test/bench/servlet/FullTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bench/servlet/FullTester.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bench/servlet/FullTester.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletRequest;
public class FullTester {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
int maxClients;
HttpServletRequest req;
Modified: trunk/testsuite/src/main/org/jboss/test/bench/servlet/SimpleServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/bench/servlet/SimpleServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/bench/servlet/SimpleServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -38,7 +38,7 @@
import org.jboss.test.bench.interfaces.*;
public class SimpleServlet extends HttpServlet {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
PrintWriter out;
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
Modified: trunk/testsuite/src/main/org/jboss/test/cache/test/aop/LocalUnitAopTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/test/aop/LocalUnitAopTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cache/test/aop/LocalUnitAopTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -49,7 +49,7 @@
public class LocalUnitAopTest extends JBossTestCase
{
-// Category log = getLog();
+// Logger log = getLog();
Logger log = Logger.getLogger(LocalUnitAopTest.class);
TreeCacheAopTester tester;
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularLoadTests.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularLoadTests.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularLoadTests.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,10 +26,7 @@
import java.lang.reflect.UndeclaredThrowableException;
import java.net.URL;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
+import org.jboss.logging.Logger;
import org.jboss.mx.loading.UnifiedClassLoader;
import org.jboss.mx.loading.UnifiedClassLoader3;
import org.jboss.mx.loading.UnifiedLoaderRepository3;
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import java.net.URL;
import java.lang.reflect.Constructor;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.classloader.circularity.support.Support;
import org.jboss.mx.loading.LoaderRepository;
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests3.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests3.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/CircularityErrorTests3.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,9 +24,7 @@
import java.net.URL;
import java.lang.reflect.Constructor;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
+import org.jboss.logging.Logger;
import org.jboss.test.classloader.circularity.support.Support;
import org.jboss.mx.loading.UnifiedClassLoader;
@@ -163,13 +161,4 @@
}
}
- public static void main(String[] args) throws Exception
- {
- Logger root = Logger.getRootLogger();
- PatternLayout layout = new PatternLayout("[%r,%c] %m%n");
- ConsoleAppender console = new ConsoleAppender(layout);
- root.addAppender(console);
- CircularityErrorTests3 tst = new CircularityErrorTests3();
- tst.testClassCircularityError();
- }
}
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/DeadlockTests3.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/DeadlockTests3.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/DeadlockTests3.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -23,7 +23,7 @@
import java.net.URL;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.mx.loading.UnifiedClassLoader;
import org.jboss.mx.loading.UnifiedClassLoader3;
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/RecursiveCCETests.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/RecursiveCCETests.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/circularity/test/RecursiveCCETests.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -23,7 +23,7 @@
import java.net.URL;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.mx.loading.UnifiedClassLoader;
import org.jboss.mx.loading.UnifiedClassLoader3;
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/interrupt/TestThread.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/interrupt/TestThread.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/interrupt/TestThread.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.classloader.interrupt;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A thread subclass that loads a class while its interrupted flag is set.
*
Modified: trunk/testsuite/src/main/org/jboss/test/classloader/test/BasicLoaderUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/test/BasicLoaderUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/test/BasicLoaderUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import org.jboss.mx.loading.UnifiedLoaderRepository3;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.test.util.ClassMover;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtField;
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/drm/DRMUser.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/drm/DRMUser.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/drm/DRMUser.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -56,11 +56,11 @@
this.partitionName = partitionName;
}
- public String getCategory()
+ public String getLogger()
{
return category;
}
- public void setCategory(String category)
+ public void setLogger(String category)
{
this.category = category;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/ds/DistributedStateUser.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -57,11 +57,11 @@
this.partitionName = partitionName;
}
- public String getCategory()
+ public String getLogger()
{
return category;
}
- public void setCategory(String category)
+ public void setLogger(String category)
{
this.category = category;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -49,8 +49,8 @@
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
+import org.jboss.logging.Logger;
import org.jgroups.stack.IpAddress;
-import org.apache.log4j.Logger;
import EDU.oswego.cs.dl.util.concurrent.Semaphore;
@@ -65,8 +65,10 @@
static class TestListener extends UnicastRemoteObject
implements RMINotificationListener
{
+ private static final long serialVersionUID = 1;
private Logger log;
- TestListener(Logger log) throws RemoteException
+
+ public TestListener(Logger log) throws RemoteException
{
this.log = log;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/StatefulSessionServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/StatefulSessionServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/StatefulSessionServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
import javax.servlet.ServletException;
import javax.servlet.ServletConfig;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* @author Scott.Stark at jboss.org
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/ejb/CMRBugManagerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/ejb/CMRBugManagerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/ejb/CMRBugManagerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -34,7 +34,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocalHome;
import org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal;
@@ -57,7 +57,7 @@
{
private CMRBugEJBLocalHome cmrBugHome;
- private Category log = Category.getInstance(getClass());
+ private Logger log = Logger.getLogger(getClass());
public CMRBugManagerBean()
{
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ChildBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ChildBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ChildBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -25,7 +25,7 @@
import javax.ejb.EntityContext;
import javax.ejb.RemoveException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* The problem child.
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ParentBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ParentBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/ejb/ParentBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import javax.ejb.RemoveException;
import javax.naming.NamingException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.cmp2.cmrstress.interfaces.ChildLocal;
import org.jboss.test.cmp2.cmrstress.interfaces.ChildUtil;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ABean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ABean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ABean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.cmrtree.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
@@ -51,7 +51,7 @@
public abstract class ABean implements EntityBean
{
// Attributes -----------------------------------------------
- Category log = Category.getInstance(ABean.class);
+ Logger log = Logger.getLogger(ABean.class);
private EntityContext ctx;
// CMP accessors --------------------------------------------
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.cmrtree.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
@@ -53,7 +53,7 @@
implements EntityBean
{
// Attributes -----------------------------------------------
- Category log = Category.getInstance(BBean.class);
+ Logger log = Logger.getLogger(BBean.class);
private EntityContext ctx;
// CMP accessors --------------------------------------------
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -22,7 +22,7 @@
package org.jboss.test.cmp2.cmrtree.ejb;
import java.util.Collection;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
@@ -42,7 +42,7 @@
public class FacadeSessionBean
implements SessionBean
{
- private static Category log = Category.getInstance(FacadeSessionBean.class);
+ private static Logger log = Logger.getLogger(FacadeSessionBean.class);
SessionContext ctx;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,8 +35,8 @@
*/
public class EJBSelectUnitTestCase extends EJBTestCase
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(EJBSelectUnitTestCase.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(EJBSelectUnitTestCase.class);
public static Test suite() throws Exception
{
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.fkmapping.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.SessionBean;
import javax.ejb.EJBException;
@@ -47,7 +47,7 @@
implements SessionBean
{
// Attributes ------------------------------------------------
- static Category log = Category.getInstance(ManagerSessionBean.class);
+ static Logger log = Logger.getLogger(ManagerSessionBean.class);
private InstituteLocalHome instituteHome;
private DepartmentLocalHome departmentHome;
private GroupLocalHome groupHome;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.fkstackoverflow.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
@@ -49,7 +49,7 @@
public abstract class ChildEntityBean
implements EntityBean
{
- Category log = Category.getInstance(ChildEntityBean.class);
+ Logger log = Logger.getLogger(ChildEntityBean.class);
private EntityContext ctx;
// CMP accessors
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.fkstackoverflow.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
@@ -49,7 +49,7 @@
public abstract class ComplexParentBean
implements EntityBean
{
- Category log = Category.getInstance(ComplexParentBean.class);
+ Logger log = Logger.getLogger(ComplexParentBean.class);
private EntityContext ctx;
// CMP accessors
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.fkstackoverflow.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
@@ -41,7 +41,7 @@
public class FacadeSessionBean
implements SessionBean
{
- private static Category log = Category.getInstance(FacadeSessionBean.class);
+ private static Logger log = Logger.getLogger(FacadeSessionBean.class);
// Business methods
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.cmp2.fkstackoverflow.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
@@ -50,7 +50,7 @@
public abstract class SimpleParentBean
implements EntityBean
{
- Category log = Category.getInstance(SimpleParentBean.class);
+ Logger log = Logger.getLogger(SimpleParentBean.class);
private EntityContext ctx;
// CMP accessors
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import junit.framework.Test;
import net.sourceforge.junitejb.EJBTestCase;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/keygen/test/KeyGenerationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/keygen/test/KeyGenerationUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/keygen/test/KeyGenerationUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.naming.InitialContext;
import junit.framework.Test;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.test.cmp2.keygen.ejb.UnknownPKLocal;
import org.jboss.test.cmp2.keygen.ejb.UnknownPKLocalHome;
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/ejb/FacadeBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/ejb/FacadeBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/ejb/FacadeBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import org.jboss.test.cmp2.optimisticlock.interfaces.CmpEntityLocal;
import org.jboss.test.cmp2.optimisticlock.interfaces.CmpEntityLocalHome;
import org.jboss.test.cmp2.optimisticlock.interfaces.FacadeHome;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.SessionBean;
import javax.ejb.CreateException;
@@ -46,7 +46,7 @@
implements SessionBean
{
// Attributes --------------------------------------------
- static Category log = Category.getInstance(FacadeBean.class);
+ static Logger log = Logger.getLogger(FacadeBean.class);
private FacadeHome myHome;
// Business methods --------------------------------------
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookEntryBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookEntryBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookEntryBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -80,8 +80,8 @@
public abstract double getAmount();
public abstract void setAmount(double amount);
- public abstract String getCategory();
- public abstract void setCategory(String category);
+ public abstract String getLogger();
+ public abstract void setLogger(String category);
public abstract long getTimestamp();
public abstract void setTimestamp(long timestamp);
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookMgrBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookMgrBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/perf/ejb/CheckBookMgrBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -117,7 +117,7 @@
return total;
}
- public double entryTotalByCategory(String category)
+ public double entryTotalByLogger(String category)
{
double total = 0;
return total;
@@ -154,7 +154,7 @@
entryNo ++;
entry.setAmount(1);
entry.setTimestamp(timestamp);
- entry.setCategory(categories[n]);
+ entry.setLogger(categories[n]);
entries.add(entry);
timestamp += 3600 * 1000;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/perf/interfaces/LocalCheckBookEntry.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/perf/interfaces/LocalCheckBookEntry.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/perf/interfaces/LocalCheckBookEntry.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,8 +35,8 @@
public double getAmount();
public void setAmount(double amount);
- public String getCategory();
- public void setCategory(String category);
+ public String getLogger();
+ public void setLogger(String category);
public long getTimestamp();
public void setTimestamp(long timestamp);
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/readonly/ReadonlyUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,8 +35,8 @@
public class ReadonlyUnitTestCase extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ReadonlyUnitTestCase.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ReadonlyUnitTestCase.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyBidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,8 +31,8 @@
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToManyUnidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/manyToOneUnidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyBidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,8 +29,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToManyUnidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneBidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/relationship/oneToOneUnidirectional/ABTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
import org.jboss.test.JBossTestCase;
public class ABTest extends EJBTestCase {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(ABTest.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(ABTest.class);
public static Test suite() throws Exception {
return JBossTestCase.getDeploySetup(ABTest.class, "cmp2-relationship.jar");
Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/simple/SimpleUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/simple/SimpleUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/simple/SimpleUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import javax.naming.InitialContext;
import javax.ejb.DuplicateKeyException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/BmpCallbackBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/BmpCallbackBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/BmpCallbackBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
public class BmpCallbackBean
implements EntityBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
EntityContext ctx;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/CallerSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.cts.interfaces.CallerSession;
import org.jboss.test.cts.interfaces.CallerSessionHome;
import org.jboss.test.cts.interfaces.ReferenceTest;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsBmpBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsBmpBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsBmpBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -64,7 +64,7 @@
public class CtsBmpBean
implements EntityBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private static final String TABLE_NAME = "BMP_BEAN_TBL";
EntityContext ctx = null;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -5,7 +5,7 @@
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
@author Scott.Stark at jboss.org
@@ -14,7 +14,7 @@
public abstract class CtsCmp2Bean implements EntityBean
{
private static String VERSION = "CtsCmp2BeanV2";
- private static Category log = Category.getInstance(CtsCmp2Bean.class);
+ private static Logger log = Logger.getLogger(CtsCmp2Bean.class);
private EntityContext ctx;
public String ejbCreate(String key, String data)
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.ejb.AllowedOperationsAssociation;
import org.jboss.test.cts.interfaces.BeanContextInfo;
import org.jboss.test.cts.interfaces.CtsCmpLocal;
@@ -61,7 +61,7 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
- private static transient Category log = Category.getInstance(StatefulSessionBean.class);
+ private static transient Logger log = Logger.getLogger(StatefulSessionBean.class);
private transient int counterAtTxStart;
private String testName;
private int counter;
@@ -76,19 +76,19 @@
public void ejbCreate(String testName)
{
this.testName = testName;
- log = Category.getInstance(StatefulSessionBean.class.getName()+"#"+testName);
+ log = Logger.getLogger(StatefulSessionBean.class.getName()+"#"+testName);
log.debug("ejbCreate("+testName+"), ctx="+sessionCtx);
}
public void ejbCreateAlt(String testName)
{
this.testName = testName + "Alt";
- log = Category.getInstance(StatefulSessionBean.class.getName()+"#"+testName);
+ log = Logger.getLogger(StatefulSessionBean.class.getName()+"#"+testName);
log.debug("ejbCreateAlt("+testName+"), ctx="+sessionCtx);
}
public void ejbActivate()
{
- log = Category.getInstance(StatefulSessionBean.class.getName()+"#"+testName);
+ log = Logger.getLogger(StatefulSessionBean.class.getName()+"#"+testName);
// Expecting : AllowedOperationsFlags.IN_EJB_ACTIVATE
log.info("ejbActivate( ) - inMethodFlag : " + AllowedOperationsAssociation.peekInMethodFlagAsString());
Modified: trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.cts.interfaces.StatefulSessionLocalHome;
import org.jboss.test.cts.interfaces.StatefulSessionLocal;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/interfaces/UserTransactionTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/interfaces/UserTransactionTester.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/interfaces/UserTransactionTester.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -42,8 +42,8 @@
*/
public class UserTransactionTester
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(UserTransactionTester.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(UserTransactionTester.class);
/**
* Home of entity used as a resource for testing.
Modified: trunk/testsuite/src/main/org/jboss/test/cts/jms/ContainerMBox.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/jms/ContainerMBox.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/jms/ContainerMBox.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
public class ContainerMBox
implements MessageListener
@@ -50,7 +50,7 @@
private QueueReceiver qreceiver;
private Queue queue;
- private Category log;
+ private Logger log;
public static final String EJB_CREATE_MSG = "EJB_CREATE_MSG";
public static final String EJB_POST_CREATE_MSG = "EJB_POST_CREATE_MSG";
@@ -66,7 +66,7 @@
public ContainerMBox ( )
{
- log = Category.getInstance(getClass().getName());
+ log = Logger.getLogger(getClass().getName());
try
{
init( new InitialContext(), QUEUE );
Modified: trunk/testsuite/src/main/org/jboss/test/cts/jms/MsgSender.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/jms/MsgSender.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/jms/MsgSender.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
public class MsgSender
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public final static String JMS_FACTORY="ConnectionFactory";
public final static String QUEUE="queue/testQueue";
Modified: trunk/testsuite/src/main/org/jboss/test/cts/test/ClientCallbackImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/test/ClientCallbackImpl.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/test/ClientCallbackImpl.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,12 +24,12 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.cts.interfaces.ClientCallback;
public class ClientCallbackImpl implements ClientCallback
{
- private static Category log = Category.getInstance(ClientCallbackImpl.class);
+ private static Logger log = Logger.getLogger(ClientCallbackImpl.class);
private boolean wasCalled;
public ClientCallbackImpl()
Modified: trunk/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/test/MDBInvoker.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.jms.ObjectMessage;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* @author Scott.Stark at jboss.org
@@ -38,7 +38,7 @@
*/
public class MDBInvoker extends Thread
{
- Category log;
+ Logger log;
QueueSession session;
Queue queueA;
Queue queueB;
@@ -47,7 +47,7 @@
Exception runEx;
public MDBInvoker(QueueSession session, Queue queueA, Queue queueB, int id,
- CountDown done, Category log)
+ CountDown done, Logger log)
{
super("MDBInvoker#"+id);
this.session = session;
Modified: trunk/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/cts/test/SessionInvoker.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import org.jboss.test.cts.interfaces.StrictlyPooledSession;
import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
/** Invoker thread for StatelessSession tests.
@@ -34,12 +34,12 @@
public class SessionInvoker extends Thread
{
StrictlyPooledSessionHome home;
- Category log;
+ Logger log;
int id;
CountDown done;
Exception runEx;
public SessionInvoker(StrictlyPooledSessionHome home, int id, CountDown done,
- Category log)
+ Logger log)
{
super("SessionInvoker#"+id);
this.home = home;
Modified: trunk/testsuite/src/main/org/jboss/test/deadlock/bean/EnterpriseEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deadlock/bean/EnterpriseEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/deadlock/bean/EnterpriseEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
public abstract class EnterpriseEntityBean implements EntityBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private EntityContext entityContext;
public int otherField = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/deadlock/bean/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deadlock/bean/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/deadlock/bean/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
public class StatelessSessionBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/deadlock/test/BeanStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deadlock/test/BeanStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/deadlock/test/BeanStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -51,7 +51,7 @@
public class BeanStressTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -22,7 +22,7 @@
package org.jboss.test.dtm.ejb;
import javax.ejb.CreateException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.EntitySupport;
@@ -35,8 +35,8 @@
public abstract class AccountEntityBean
extends EntitySupport
{
- private static transient Category log =
- Category.getInstance(AccountEntityBean.class);
+ private static transient Logger log =
+ Logger.getLogger(AccountEntityBean.class);
public abstract String getName();
public abstract void setName(String name);
@@ -48,7 +48,7 @@
{
this.setName(name);
this.setBalance(initialBalance);
- log = Category.getInstance(AccountEntityBean.class.getName() +
+ log = Logger.getLogger(AccountEntityBean.class.getName() +
"#" + name);
log.debug("ejbCreate(" + name + ", " + initialBalance +
"), ctx=" + entityCtx);
Modified: trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtm/ejb/AccountSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -23,7 +23,7 @@
import javax.ejb.SessionSynchronization;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.SessionSupport;
@@ -37,8 +37,8 @@
extends SessionSupport
implements SessionSynchronization
{
- private static transient Category log =
- Category.getInstance(AccountSessionBean.class);
+ private static transient Logger log =
+ Logger.getLogger(AccountSessionBean.class);
private transient int balanceAtTxStart;
private String testName;
@@ -48,7 +48,7 @@
{
this.testName = name;
this.balance = initialBalance;
- log = Category.getInstance(AccountSessionBean.class.getName() +
+ log = Logger.getLogger(AccountSessionBean.class.getName() +
"#" + testName);
log.debug("ejbCreate(" + name + ", " + initialBalance +
"), ctx=" + sessionCtx);
Modified: trunk/testsuite/src/main/org/jboss/test/dtm/ejb/FrontEndBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtm/ejb/FrontEndBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtm/ejb/FrontEndBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.dtm.interfaces.Account;
import org.jboss.test.dtm.interfaces.AccountHome;
import org.jboss.test.dtm.interfaces.AccountEntityHome;
@@ -44,8 +44,8 @@
public class FrontEndBean
extends SessionSupport
{
- private static transient Category log =
- Category.getInstance(FrontEndBean.class);
+ private static transient Logger log =
+ Logger.getLogger(FrontEndBean.class);
private String testName;
private Account account1, account2, account3;
@@ -58,7 +58,7 @@
public void ejbCreate(String name, boolean reuseAccounts)
{
this.testName = name;
- log = Category.getInstance(FrontEndBean.class.getName() + "#" + testName);
+ log = Logger.getLogger(FrontEndBean.class.getName() + "#" + testName);
log.debug("ejbCreate(" + name + "), ctx=" + sessionCtx);
if (reuseAccounts)
findAccounts();
Modified: trunk/testsuite/src/main/org/jboss/test/dtm/ejb/PassThroughBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtm/ejb/PassThroughBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtm/ejb/PassThroughBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.dtm.interfaces.Worker;
import org.jboss.test.dtm.interfaces.WorkerHome;
import org.jboss.test.util.ejb.SessionSupport;
@@ -42,8 +42,8 @@
public class PassThroughBean
extends SessionSupport
{
- private static transient Category log =
- Category.getInstance(PassThroughBean.class);
+ private static transient Logger log =
+ Logger.getLogger(PassThroughBean.class);
private String testName;
private Worker workerSession;
@@ -51,7 +51,7 @@
public void ejbCreate(String name)
{
this.testName = name;
- log = Category.getInstance(PassThroughBean.class.getName() + "#" + testName);
+ log = Logger.getLogger(PassThroughBean.class.getName() + "#" + testName);
log.debug("ejbCreate(" + name + "), ctx=" + sessionCtx);
initWorker();
}
Modified: trunk/testsuite/src/main/org/jboss/test/dtm/ejb/WorkerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtm/ejb/WorkerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtm/ejb/WorkerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.dtm.interfaces.Account;
import org.jboss.test.dtm.interfaces.AccountHome;
import org.jboss.test.util.ejb.SessionSupport;
@@ -42,8 +42,8 @@
public class WorkerBean
extends SessionSupport
{
- private static transient Category log =
- Category.getInstance(WorkerBean.class);
+ private static transient Logger log =
+ Logger.getLogger(WorkerBean.class);
private String testName;
private Account account1, account2;
@@ -51,7 +51,7 @@
public void ejbCreate(String name)
{
this.testName = name;
- log = Category.getInstance(WorkerBean.class.getName() + "#" + testName);
+ log = Logger.getLogger(WorkerBean.class.getName() + "#" + testName);
log.debug("ejbCreate(" + name + "), ctx=" + sessionCtx);
initAccounts();
}
Modified: trunk/testsuite/src/main/org/jboss/test/dtmusertx/ejb/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/dtmusertx/ejb/StatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/dtmusertx/ejb/StatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -23,7 +23,7 @@
import javax.ejb.SessionSynchronization;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.SessionSupport;
@@ -36,7 +36,7 @@
extends SessionSupport
implements SessionSynchronization
{
- private static transient Category log = Category.getInstance(StatefulSessionBean.class);
+ private static transient Logger log = Logger.getLogger(StatefulSessionBean.class);
private transient int counterAtTxStart;
private String testName;
private int counter;
@@ -44,7 +44,7 @@
public void ejbCreate(String testName)
{
this.testName = testName;
- log = Category.getInstance(StatefulSessionBean.class.getName()+"#"+testName);
+ log = Logger.getLogger(StatefulSessionBean.class.getName()+"#"+testName);
log.debug("ejbCreate("+testName+"), ctx="+sessionCtx);
}
Modified: trunk/testsuite/src/main/org/jboss/test/entityexc/ejb/EntityExcBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entityexc/ejb/EntityExcBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/entityexc/ejb/EntityExcBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -55,8 +55,8 @@
*/
public class EntityExcBean implements EntityBean
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(EntityExcBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(EntityExcBean.class);
static final private boolean debug = true;
Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/test/TimersUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/test/TimersUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/test/TimersUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -111,9 +111,9 @@
assertTrue("Timer.InitialDate("+t1+") == now("+t0+")", t0 == t1);
assertTrue("Timer.Id == id", found.getId().equals(id));
assertTrue("Timer.TimerInterval == interval", found.getTimerInterval().equals(interval));
- Object tmp = unserialize(found.getInstancePK());
+ Object tmp = deserialize(found.getInstancePK());
assertTrue("Timer.InstancePK == key", tmp.equals(key));
- tmp = unserialize(found.getInfo());
+ tmp = deserialize(found.getInfo());
log.info("Info: "+tmp);
assertTrue("Timer.Info == info", tmp.equals(info));
}
@@ -133,19 +133,4 @@
}
}
- private byte[] serialize(Serializable data) throws IOException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(data);
- oos.close();
- return baos.toByteArray();
- }
- private Object unserialize(byte[] data) throws IOException, ClassNotFoundException
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(data);
- ObjectInputStream ois = new ObjectInputStream(bais);
- Object obj = ois.readObject();
- return obj;
- }
}
\ No newline at end of file
Modified: trunk/testsuite/src/main/org/jboss/test/invokers/ejb/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/invokers/ejb/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/invokers/ejb/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,8 +37,8 @@
*/
public class StatelessSessionBean implements SessionBean
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(StatelessSessionBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(StatelessSessionBean.class);
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/isolation/web/c/ContextListener.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/isolation/web/c/ContextListener.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/isolation/web/c/ContextListener.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import javax.servlet.ServletContextListener;
import javax.servlet.ServletContextEvent;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* A ContextListener.
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -48,7 +48,7 @@
import javax.naming.NamingException;
import org.jboss.test.jbossmessaging.JMSTestCase;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JMS tests base class.
@@ -78,7 +78,7 @@
public static final int TRANS_TOTAL = 2;
public static final String[] TRANS_DESC = {"NOT", "individually", "totally"};
public static final int DEFAULT_RUNSLEEP = 50;
- public final Category log = getLog();
+ public final Logger log = getLog();
// Provider specific
public String TOPIC_FACTORY = "ConnectionFactory";
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
import javax.jms.Queue;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
/**
* JMSPerfStressTestCase.java Some simple tests of JMS provider
@@ -101,7 +101,7 @@
queueConnection.stop();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -238,7 +238,7 @@
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -377,7 +377,7 @@
drainQueue();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -504,7 +504,7 @@
drainQueue();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -51,7 +51,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -211,7 +211,7 @@
{
public void run()
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
try
{
log.debug("Server Thread Started");
@@ -578,7 +578,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML");
try
{
@@ -616,7 +616,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML 2");
try
{
@@ -670,7 +670,7 @@
{
public void onMessage(Message mess)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("Processing message");
try
{
@@ -692,7 +692,7 @@
{
public ServerSession getServerSession()
{
- Category.getInstance(getClass().getName()).debug("Getting server session.");
+ Logger.getLogger(getClass().getName()).debug("Getting server session.");
return new ServerSession()
{
public Session getSession()
@@ -701,7 +701,7 @@
}
public void start()
{
- Category.getInstance(getClass().getName()).debug("Starting server session.");
+ Logger.getLogger(getClass().getName()).debug("Starting server session.");
session.run();
}
};
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -47,7 +47,7 @@
import javax.naming.InitialContext;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
/**
@@ -465,7 +465,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML");
try
{
@@ -503,7 +503,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML 2");
try
{
@@ -557,7 +557,7 @@
{
public void onMessage(Message mess)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("Processing message");
try
{
@@ -579,7 +579,7 @@
{
public ServerSession getServerSession()
{
- Category.getInstance(getClass().getName()).debug("Getting server session.");
+ Logger.getLogger(getClass().getName()).debug("Getting server session.");
return new ServerSession()
{
public Session getSession()
@@ -588,7 +588,7 @@
}
public void start()
{
- Category.getInstance(getClass().getName()).debug("Starting server session.");
+ Logger.getLogger(getClass().getName()).debug("Starting server session.");
session.run();
}
};
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
import javax.jms.TextMessage;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
/**
@@ -62,7 +62,7 @@
QueueReceiver receiver;
QueueSender sender;
- Category log;
+ Logger log;
public MessageBodyUnitTestCase(String name) throws Exception
{
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
import javax.jms.Queue;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
/**
@@ -96,7 +96,7 @@
{
drainQueue();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -148,7 +148,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -198,7 +198,7 @@
drainQueue();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -271,7 +271,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -351,7 +351,7 @@
drainDurableTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -701,9 +701,9 @@
public int iterationCount;
- public Category log;
+ public Logger log;
- public MyMessageListener(int iterationCount, Category log)
+ public MyMessageListener(int iterationCount, Logger log)
{
this.iterationCount = iterationCount;
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JMSTestCase;
/**
@@ -300,7 +300,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -371,7 +371,7 @@
drainDurableTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -663,9 +663,9 @@
public int iterationCount;
- public Category log;
+ public Logger log;
- public MyMessageListener(int iterationCount, Category log)
+ public MyMessageListener(int iterationCount, Logger log)
{
this.iterationCount = iterationCount;
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/MQBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/MQBase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/MQBase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -48,7 +48,7 @@
import javax.naming.NamingException;
import org.jboss.test.JBossTestCase;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JMS tests base class.
@@ -78,7 +78,7 @@
public static final int TRANS_TOTAL = 2;
public static final String[] TRANS_DESC = {"NOT", "individually", "totally"};
public static final int DEFAULT_RUNSLEEP = 50;
- public final Category log = getLog();
+ public final Logger log = getLog();
// Provider specific
public String TOPIC_FACTORY = "ConnectionFactory";
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/InvocationLayerStressTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import EDU.oswego.cs.dl.util.concurrent.Semaphore;
@@ -143,13 +143,13 @@
String queueName;
Throwable exception;
Object signal = new Object();
- Category log = Category.getInstance(QueueWorker.class);
+ Logger log = Logger.getLogger(QueueWorker.class);
QueueWorker(String queueName, String ilType)
{
super(queueName);
this.queueName = queueName;
- this.log = Category.getInstance("QueueWorker."+queueName+"."+ilType);
+ this.log = Logger.getLogger("QueueWorker."+queueName+"."+ilType);
}
public void run()
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/JBossMQPerfStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/JBossMQPerfStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/perf/JBossMQPerfStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -40,7 +40,7 @@
import javax.jms.Queue;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
* JBossMQPerfStressTestCase.java Some simple tests of JBossMQ
@@ -99,7 +99,7 @@
queueConnection.stop();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -236,7 +236,7 @@
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -375,7 +375,7 @@
drainQueue();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -502,7 +502,7 @@
drainQueue();
}
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -51,7 +51,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -211,7 +211,7 @@
{
public void run()
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
try
{
log.debug("Server Thread Started");
@@ -578,7 +578,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML");
try
{
@@ -616,7 +616,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML 2");
try
{
@@ -670,7 +670,7 @@
{
public void onMessage(Message mess)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("Processing message");
try
{
@@ -692,7 +692,7 @@
{
public ServerSession getServerSession()
{
- Category.getInstance(getClass().getName()).debug("Getting server session.");
+ Logger.getLogger(getClass().getName()).debug("Getting server session.");
return new ServerSession()
{
public Session getSession()
@@ -701,7 +701,7 @@
}
public void start()
{
- Category.getInstance(getClass().getName()).debug("Starting server session.");
+ Logger.getLogger(getClass().getName()).debug("Starting server session.");
session.run();
}
};
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/test/Jms11UnitTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -47,7 +47,7 @@
import javax.naming.InitialContext;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
@@ -465,7 +465,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML");
try
{
@@ -503,7 +503,7 @@
{
public void onMessage(Message msg)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("ML 2");
try
{
@@ -557,7 +557,7 @@
{
public void onMessage(Message mess)
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
log.debug("Processing message");
try
{
@@ -579,7 +579,7 @@
{
public ServerSession getServerSession()
{
- Category.getInstance(getClass().getName()).debug("Getting server session.");
+ Logger.getLogger(getClass().getName()).debug("Getting server session.");
return new ServerSession()
{
public Session getSession()
@@ -588,7 +588,7 @@
}
public void start()
{
- Category.getInstance(getClass().getName()).debug("Starting server session.");
+ Logger.getLogger(getClass().getName()).debug("Starting server session.");
session.run();
}
};
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/test/MessageBodyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/test/MessageBodyUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/test/MessageBodyUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
import javax.jms.TextMessage;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
@@ -61,7 +61,7 @@
QueueReceiver receiver;
QueueSender sender;
- Category log;
+ Logger log;
public MessageBodyUnitTestCase(String name) throws Exception
{
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/test/RollBackUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/test/RollBackUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/test/RollBackUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
import javax.jms.Queue;
import javax.naming.Context;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
@@ -95,7 +95,7 @@
{
drainQueue();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -147,7 +147,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -197,7 +197,7 @@
drainQueue();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -270,7 +270,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -350,7 +350,7 @@
drainDurableTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread = new Thread()
{
@@ -700,9 +700,9 @@
public int iterationCount;
- public Category log;
+ public Logger log;
- public MyMessageListener(int iterationCount, Category log)
+ public MyMessageListener(int iterationCount, Logger log)
{
this.iterationCount = iterationCount;
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
@@ -298,7 +298,7 @@
drainTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -369,7 +369,7 @@
drainDurableTopic();
final int iterationCount = getIterationCount();
- final Category log = getLog();
+ final Logger log = getLog();
Thread sendThread =
new Thread()
@@ -661,9 +661,9 @@
public int iterationCount;
- public Category log;
+ public Logger log;
- public MyMessageListener(int iterationCount, Category log)
+ public MyMessageListener(int iterationCount, Logger log)
{
this.iterationCount = iterationCount;
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoUtil.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoUtil.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -44,7 +44,7 @@
public class InfoUtil
{
- static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(InfoUtil.class);
+ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(InfoUtil.class);
public static MBeanInfo getMBeanInfo(Object mbean, String name)
{
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/ContextCLTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,10 +37,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.WriterAppender;
-
import org.jboss.mx.loading.UnifiedLoaderRepository3;
import org.jboss.mx.loading.UnifiedClassLoader3;
import org.jboss.test.jbossmx.implementation.TestCase;
@@ -215,14 +211,4 @@
return suite;
}
- /** Allow the test case to run standalone
- */
- public static void main(java.lang.String[] args)
- {
- // Set up a simple configuration that logs on the console.
- Category root = Category.getRoot();
- root.addAppender(new WriterAppender(new PatternLayout("%x%m%n"), System.out));
- Test suite = ContextCLTestCase.suite();
- junit.textui.TestRunner.run(suite);
- }
}
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/support/ContextCL.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/support/ContextCL.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/implementation/server/support/ContextCL.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -25,7 +25,7 @@
import java.io.*;
import java.rmi.MarshalledObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/** The ContextCL standard MBean implementation.
*
@@ -34,7 +34,7 @@
*/
public class ContextCL implements ContextCLMBean
{
- private static Category log = Category.getInstance(ContextCL.class);
+ private static Logger log = Logger.getLogger(ContextCL.class);
private TestData data0;
/** The TestData.class ClassLoader will be the ClassLoader of the ContextCL
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/dynamic/InvocationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/dynamic/InvocationTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/dynamic/InvocationTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
public class InvocationTestCase
extends TestCase
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public InvocationTestCase(String s)
{
Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/standard/InvocationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/standard/InvocationTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/performance/standard/InvocationTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
extends TestCase
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public InvocationTestCase(String s)
{
Modified: trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/AccountBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/AccountBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/AccountBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,7 +41,7 @@
import java.util.ArrayList;
import java.sql.SQLException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
@@ -195,7 +195,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in ejbCreate", e);
+ Logger.getLogger(getClass().getName()).info("Exception in ejbCreate", e);
throw new CreateException("Can't insert: " + e);
} // end of try-catch
finally
@@ -206,7 +206,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
@@ -243,7 +243,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in findByPK", e);
+ Logger.getLogger(getClass().getName()).info("Exception in findByPK", e);
throw new EJBException("Problem in findByPrimaryKey: " + e);
} // end of try-catch
finally
@@ -254,7 +254,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
return id;
@@ -285,7 +285,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in findbyCustomerID", e);
+ Logger.getLogger(getClass().getName()).info("Exception in findbyCustomerID", e);
throw new EJBException(e);
} // end of try-catch
finally
@@ -296,7 +296,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
}
@@ -315,7 +315,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing c: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing c: " + e);
} // end of try-catch
c = null;
} // end of if ()
@@ -326,7 +326,7 @@
id = (Integer) ctx.getPrimaryKey();
if (id == null)
{
- Category.getInstance(getClass().getName()).info("null id!");
+ Logger.getLogger(getClass().getName()).info("null id!");
} // end of if ()
PreparedStatement ps = null;
@@ -336,7 +336,7 @@
ps = getConnection().prepareStatement("SELECT BALANCE, CUSTOMERID FROM CCBMPACCOUNT WHERE ID = ?");
if (ps == null)
{
- Category.getInstance(getClass().getName()).info("WFT? null ps!");
+ Logger.getLogger(getClass().getName()).info("WFT? null ps!");
} // end of if ()
ps.setInt(1, id.intValue());
@@ -348,7 +348,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in ejbLoad", e);
+ Logger.getLogger(getClass().getName()).info("Exception in ejbLoad", e);
throw new EJBException(e);
} // end of try-catch
finally
@@ -359,7 +359,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
}
@@ -377,7 +377,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in ejbStore", e);
+ Logger.getLogger(getClass().getName()).info("Exception in ejbStore", e);
throw new EJBException(e);
} // end of try-catch
finally
@@ -388,7 +388,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
@@ -405,7 +405,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception in ejbRemove", e);
+ Logger.getLogger(getClass().getName()).info("Exception in ejbRemove", e);
throw new EJBException(e);
} // end of try-catch
finally
@@ -416,7 +416,7 @@
}
catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("Exception closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("Exception closing ps: " + e);
} // end of try-catch
} // end of finally
}
Modified: trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/CustomerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/CustomerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/CustomerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -40,7 +40,7 @@
import javax.naming.InitialContext;
import java.util.ArrayList;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jca.bank.interfaces.AccountLocal;
import org.jboss.test.jca.bank.interfaces.AccountLocalHome;
@@ -208,7 +208,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing ps: " + e);
} // end of try-catch
} // end of finally
return id;
@@ -246,7 +246,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing ps: " + e);
} // end of try-catch
} // end of finally
return id;
@@ -270,7 +270,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing c: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing c: " + e);
} // end of try-catch
c = null;
} // end of if ()
@@ -308,7 +308,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing ps: " + e);
} // end of try-catch
} // end of finally
}
@@ -335,7 +335,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing ps: " + e);
} // end of try-catch
} // end of finally
@@ -362,7 +362,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing ps: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing ps: " + e);
} // end of try-catch
} // end of finally
Modified: trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/TellerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/TellerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/bank/ejb/TellerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jca.bank.interfaces.Account;
import org.jboss.test.jca.bank.interfaces.AccountHome;
import org.jboss.test.jca.bank.interfaces.AccountLocal;
@@ -143,7 +143,7 @@
{
try
{
- Category.getInstance(TellerBean.class.getName()).info("Invocation #"+invocations++);
+ Logger.getLogger(TellerBean.class.getName()).info("Invocation #"+invocations++);
from.withdraw(amount);
to.deposit(amount);
} catch (Exception e)
@@ -191,7 +191,7 @@
return a.getBalance();
} catch (Exception e)
{
- Category.getInstance(getClass().getName()).info("getAccountBalance failed", e);
+ Logger.getLogger(getClass().getName()).info("getAccountBalance failed", e);
throw new EJBException("Could not get account for id " + id, e);
}
}
@@ -235,7 +235,7 @@
}
catch (SQLException e)
{
- Category.getInstance(getClass().getName()).info("SQLException closing c: " + e);
+ Logger.getLogger(getClass().getName()).info("SQLException closing c: " + e);
} // end of try-catch
c = null;
} // end of if ()
Modified: trunk/testsuite/src/main/org/jboss/test/jca/ejb/CachedConnectionSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/ejb/CachedConnectionSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/ejb/CachedConnectionSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.jca.interfaces.CachedConnectionSessionLocal;
/**
@@ -55,7 +55,7 @@
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
private Connection conn;
- private Category log = Category.getInstance(getClass().getName());
+ private Logger log = Logger.getLogger(getClass().getName());
private SessionContext ctx;
/**
@@ -240,7 +240,7 @@
public void ejbActivate()
{
- log = Category.getInstance(getClass());
+ log = Logger.getLogger(getClass());
try
{
//DataSource ds = (DataSource)new InitialContext().lookup("java:/comp/env/datasource");
Modified: trunk/testsuite/src/main/org/jboss/test/jca/fs/DirContextFactoryImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/fs/DirContextFactoryImpl.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/fs/DirContextFactoryImpl.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.naming.Reference;
import javax.naming.directory.DirContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* @author Scott.Stark at jboss.org
@@ -36,7 +36,7 @@
*/
public class DirContextFactoryImpl implements DirContextFactory
{
- static Category log = Category.getInstance(DirContextFactoryImpl.class);
+ static Logger log = Logger.getLogger(DirContextFactoryImpl.class);
private transient ConnectionManager manager;
private transient ManagedConnectionFactory factory;
private transient FSRequestInfo fsInfo;
Modified: trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContext.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContext.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/fs/FSDirContext.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.Attributes;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
*
@@ -41,7 +41,7 @@
*/
public class FSDirContext implements DirContext
{
- static Category log = Category.getInstance(FSDirContext.class);
+ static Logger log = Logger.getLogger(FSDirContext.class);
private FSManagedConnection mc;
/** Creates new FSDirContext */
Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/CachedConnectionBankStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/CachedConnectionBankStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/CachedConnectionBankStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import junit.framework.Test;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.test.jca.bank.interfaces.Account;
import org.jboss.test.jca.bank.interfaces.Teller;
@@ -135,7 +135,7 @@
public class TransferThread implements Runnable
{
- Category log = Category.getInstance(getClass().getName());
+ Logger log = Logger.getLogger(getClass().getName());
Account to;
Account from;
int iterationCount;
Modified: trunk/testsuite/src/main/org/jboss/test/jmsra/bean/PublisherBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmsra/bean/PublisherBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmsra/bean/PublisherBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Bean to help JMS RA test publish/send JMS messages and test transactional
@@ -60,7 +60,7 @@
private static final String BEAN_JNDI =
"java:comp/env/ejb/PublisherCMP";
- private final Category log = Category.getInstance(this.getClass());
+ private final Logger log = Logger.getLogger(this.getClass());
private SessionContext ctx; // = null;
private Queue queue; // = null;
Modified: trunk/testsuite/src/main/org/jboss/test/jmsra/bean/QueueRecBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmsra/bean/QueueRecBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmsra/bean/QueueRecBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
import javax.jms.Message;
import javax.jms.JMSException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* <p>QueueRec bean, get a message from the configured queue. The JMS stuff is
@@ -53,7 +53,7 @@
public class QueueRecBean implements SessionBean
{
- private final Category log = Category.getInstance(this.getClass());
+ private final Logger log = Logger.getLogger(this.getClass());
/**
* Name used to lookup QueueConnectionFactory
Modified: trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicAdapter.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicAdapter.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicAdapter.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.naming.*;
import javax.jms.*;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Listen on a topic, send to queue
@@ -42,7 +42,7 @@
public class TopicAdapter implements MessageDrivenBean, MessageListener{
- private static final Category log = Category.getInstance(TopicAdapter.class);
+ private static final Logger log = Logger.getLogger(TopicAdapter.class);
private static final String CONNECTION_JNDI = "java:comp/env/jms/MyQueueConnection";
private static final String QUEUE_JNDI = "java:comp/env/jms/QueueName";
Modified: trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicPublisherBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicPublisherBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmsra/bean/TopicPublisherBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,8 +32,8 @@
public class TopicPublisherBean implements SessionBean {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(TopicPublisherBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(TopicPublisherBean.class);
private static final String CONNECTION_JNDI = "java:comp/env/jms/MyTopicConnection";
private static final String TOPIC_JNDI = "java:comp/env/jms/TopicName";
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/loading/ResourceTsts.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/loading/ResourceTsts.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/loading/ResourceTsts.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBeanSupport;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -39,7 +39,6 @@
*/
public class ResourceTsts extends ServiceMBeanSupport implements ResourceTstsMBean
{
- static Category log = Category.getInstance(ResourceTsts.class);
private String namespace = null;
public ResourceTsts()
@@ -97,6 +96,7 @@
static class ConfigHandler extends DefaultHandler
{
+ static Logger log = Logger.getLogger(ConfigHandler.class);
boolean optionTag;
StringBuffer value = new StringBuffer();
String namespace;
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/nullinfo/NullInfo.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/nullinfo/NullInfo.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/nullinfo/NullInfo.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -25,8 +25,8 @@
public class NullInfo implements DynamicMBean{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(NullInfo.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(NullInfo.class);
//This is what kills it, the others aren't even called
public MBeanInfo getMBeanInfo(){
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/ListenerServiceMBeanUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/ListenerServiceMBeanUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/ListenerServiceMBeanUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/XMLAttributePersistenceManagerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/XMLAttributePersistenceManagerUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/XMLAttributePersistenceManagerUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.test.jmx.xmbean.CustomType;
Modified: trunk/testsuite/src/main/org/jboss/test/jrmp/ejb/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jrmp/ejb/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/jrmp/ejb/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,8 +35,8 @@
*/
public class StatelessSessionBean implements SessionBean
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(StatelessSessionBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(StatelessSessionBean.class);
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/load/test/Worker.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/load/test/Worker.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/load/test/Worker.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
public class Worker
extends Thread
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
// succcess or not?
Hashtable config;
Modified: trunk/testsuite/src/main/org/jboss/test/lock/bean/EnterpriseEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/lock/bean/EnterpriseEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/lock/bean/EnterpriseEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,8 +30,8 @@
public class EnterpriseEntityBean
implements EntityBean
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(EnterpriseEntityBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(EnterpriseEntityBean.class);
private EntityContext entityContext;
Modified: trunk/testsuite/src/main/org/jboss/test/lock/test/EnterpriseEntityTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/lock/test/EnterpriseEntityTest.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/lock/test/EnterpriseEntityTest.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.test.lock.interfaces.EnterpriseEntity;
@@ -298,7 +298,7 @@
*/
public Task task;
- private Category log;
+ private Logger log;
/**
* Constructor for the Worker object
@@ -307,7 +307,7 @@
* @param task Description of Parameter
* @param log Description of Parameter
*/
- public Worker(final String name, final Task task, Category log)
+ public Worker(final String name, final Task task, Logger log)
{
this.name = name;
this.task = task;
Modified: trunk/testsuite/src/main/org/jboss/test/lock/test/SpinUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/lock/test/SpinUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/lock/test/SpinUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -21,21 +21,15 @@
*/
package org.jboss.test.lock.test;
-import java.io.IOException;
-import java.rmi.RemoteException;
import javax.ejb.CreateException;
import javax.ejb.RemoveException;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
-import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.log4j.Category;
-import org.jboss.test.JBossTestCase;
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
import org.jboss.test.lock.interfaces.EnterpriseEntity;
import org.jboss.test.lock.interfaces.EnterpriseEntityHome;
@@ -195,9 +189,9 @@
{
EnterpriseEntity bean;
Exception ex;
- private Category log;
+ private Logger log;
- Run(EnterpriseEntity bean, Category log)
+ Run(EnterpriseEntity bean, Logger log)
{
this.bean = bean;
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/marathon/test/BankMarathonTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/marathon/test/BankMarathonTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/marathon/test/BankMarathonTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -55,7 +55,7 @@
import org.jboss.util.deadlock.ApplicationDeadlockException;
import org.jboss.test.JBossTestCase;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Marathon test case to test JBoss under moderate utilization for
@@ -315,11 +315,11 @@
implements Runnable
{
private int mId = 0;
- private Category mLog = null;
+ private Logger mLog = null;
public RegularTeller( int pId ) {
mId = pId;
- mLog = Category.getInstance( this.getClass().getName() );
+ mLog = Logger.getLogger( this.getClass().getName() );
}
public void run() {
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/BMPBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/BMPBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/BMPBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -44,7 +44,7 @@
*/
public class BMPBean implements MessageDrivenBean, MessageListener{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private MessageDrivenContext ctx = null;
public BMPBean() {
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/ExQueueBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/ExQueueBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/ExQueueBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
public class ExQueueBean implements MessageDrivenBean, MessageListener{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private MessageDrivenContext ctx = null;
public ExQueueBean() {
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/ObjectMessageBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/ObjectMessageBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/ObjectMessageBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
*/
public class ObjectMessageBean implements MessageDrivenBean, MessageListener{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private MessageDrivenContext ctx = null;
public ObjectMessageBean() {
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/QueueBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/QueueBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/QueueBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.jms.MessageListener;
import javax.jms.Message;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* MessageBeanImpl.java
@@ -41,7 +41,7 @@
*/
public class QueueBean implements MessageDrivenBean, MessageListener{
- private static final Category log = Category.getInstance(QueueBean.class);
+ private static final Logger log = Logger.getLogger(QueueBean.class);
private MessageDrivenContext ctx = null;
public QueueBean() {
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/TXTimeOutBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/TXTimeOutBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/TXTimeOutBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -38,7 +38,7 @@
public class TXTimeOutBean implements MessageDrivenBean, MessageListener{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
long PROCESSING_DELAY = 10; // simulate 10 seconds of processing
Modified: trunk/testsuite/src/main/org/jboss/test/mdb/bean/TopicBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/mdb/bean/TopicBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/mdb/bean/TopicBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.jms.MessageListener;
import javax.jms.Message;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* MessageBeanImpl.java
@@ -41,7 +41,7 @@
*/
public class TopicBean implements MessageDrivenBean, MessageListener{
- private static final Category log = Category.getInstance(TopicBean.class);
+ private static final Logger log = Logger.getLogger(TopicBean.class);
private MessageDrivenContext ctx = null;
public TopicBean() {
Modified: trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestENCBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestENCBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestENCBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A bean that does nothing but access resources from the ENC
to test ENC usage.
Modified: trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestEjbLinkBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestEjbLinkBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/naming/ejb/TestEjbLinkBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
*/
public class TestEjbLinkBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public void ejbCreate() throws CreateException
{
Modified: trunk/testsuite/src/main/org/jboss/test/naming/test/ImplUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/naming/test/ImplUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/naming/test/ImplUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** Simple unit tests for the jndi implementation.
*
Modified: trunk/testsuite/src/main/org/jboss/test/perf/ejb/ClientSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/perf/ejb/ClientSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/perf/ejb/ClientSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.perf.interfaces.SessionHome;
import org.jboss.test.perf.interfaces.Session;
Modified: trunk/testsuite/src/main/org/jboss/test/perf/ejb/SessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/perf/ejb/SessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/perf/ejb/SessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.perf.interfaces.EntityLocalHome;
import org.jboss.test.perf.interfaces.EntityLocal;
Modified: trunk/testsuite/src/main/org/jboss/test/perf/interfaces/EntityPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/perf/interfaces/EntityPK.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/perf/interfaces/EntityPK.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -24,7 +24,7 @@
import java.net.URL;
import java.security.ProtectionDomain;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
@author Scott.Stark at jboss.org
Modified: trunk/testsuite/src/main/org/jboss/test/pooled/test/BeanStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/pooled/test/BeanStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/pooled/test/BeanStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -57,7 +57,7 @@
public class BeanStressTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
static boolean deployed = false;
static int test = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/proxycompiler/test/ProxyCompilerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/proxycompiler/test/ProxyCompilerUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/proxycompiler/test/ProxyCompilerUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -25,7 +25,7 @@
import junit.framework.*;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.proxy.compiler.*;
@@ -39,7 +39,7 @@
public class ProxyCompilerUnitTestCase
extends TestCase
{
- private static final Category log = Category.getInstance(ProxyCompilerUnitTestCase.class);
+ private static final Logger log = Logger.getLogger(ProxyCompilerUnitTestCase.class);
protected InvocationHandler handler;
@@ -104,9 +104,9 @@
public static class LoggingInvocationHandler
implements InvocationHandler
{
- private Category log;
+ private Logger log;
- public LoggingInvocationHandler(final Category log) {
+ public LoggingInvocationHandler(final Logger log) {
this.log = log;
}
Modified: trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestEntity.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestEntity.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestEntity.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
* Revision:
*/
public class CMPFindTestEntity implements EntityBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
EntityContext entityContext;
public String key;
Modified: trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestSession.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestSession.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/readahead/ejb/CMPFindTestSession.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
* Revision:
*/
public class CMPFindTestSession implements SessionBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private static final int DATASET_SIZE = 100;
Modified: trunk/testsuite/src/main/org/jboss/test/recover/bean/AccountBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/recover/bean/AccountBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/recover/bean/AccountBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -22,7 +22,7 @@
package org.jboss.test.recover.bean;
import javax.ejb.CreateException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.util.ejb.EntitySupport;
/**
@@ -34,8 +34,8 @@
public abstract class AccountBean
extends EntitySupport
{
- private static transient Category log =
- Category.getInstance(AccountBean.class);
+ private static transient Logger log =
+ Logger.getLogger(AccountBean.class);
public abstract String getName();
public abstract void setName(String name);
@@ -47,7 +47,7 @@
{
this.setName(name);
this.setBalance(initialBalance);
- log = Category.getInstance(AccountBean.class.getName() +
+ log = Logger.getLogger(AccountBean.class.getName() +
"#" + name);
log.debug("ejbCreate(" + name + ", " + initialBalance +
"), ctx=" + entityCtx);
Modified: trunk/testsuite/src/main/org/jboss/test/recover/bean/FrontEndBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/recover/bean/FrontEndBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/recover/bean/FrontEndBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.recover.interfaces.Account;
import org.jboss.test.recover.interfaces.AccountHome;
import org.jboss.test.util.ejb.SessionSupport;
@@ -43,8 +43,8 @@
public class FrontEndBean
extends SessionSupport
{
- private static transient Category log =
- Category.getInstance(FrontEndBean.class);
+ private static transient Logger log =
+ Logger.getLogger(FrontEndBean.class);
private String testName;
private Account account1JBRem, account2JBRem, account1IIOP, account2IIOP;
@@ -57,7 +57,7 @@
public void ejbCreate(String name, boolean keepAccountBalances)
{
this.testName = name;
- log = Category.getInstance(FrontEndBean.class.getName() + "#" + testName);
+ log = Logger.getLogger(FrontEndBean.class.getName() + "#" + testName);
log.debug("ejbCreate(" + name + "), ctx=" + sessionCtx);
findAccounts(keepAccountBalances);
}
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/CalleeBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/CalleeBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/CalleeBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/** A simple session bean that is called by the CallerBean to test
run-as identity and role propagation.
@@ -36,7 +36,7 @@
*/
public class CalleeBean implements SessionBean
{
- private static Category log = Category.getInstance(CalleeBean.class);
+ private static Logger log = Logger.getLogger(CalleeBean.class);
private SessionContext sessionContext;
public void ejbCreate() throws CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.security.interfaces.StatelessSessionLocal;
import org.jboss.test.security.interfaces.StatelessSessionLocalHome;
import org.jboss.test.security.interfaces.CalledSessionHome;
@@ -45,7 +45,7 @@
*/
public class CallerBean implements SessionBean
{
- private static Category log = Category.getInstance(CallerBean.class);
+ private static Logger log = Logger.getLogger(CallerBean.class);
private SessionContext sessionContext;
public void ejbCreate() throws CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerFacadeBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerFacadeBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/CallerFacadeBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.security.interfaces.CalledSessionLocalHome;
import org.jboss.test.security.interfaces.CalledSessionLocal;
@@ -41,7 +41,7 @@
*/
public class CallerFacadeBean implements SessionBean
{
- private static Category log = Category.getInstance(CallerFacadeBean.class);
+ private static Logger log = Logger.getLogger(CallerFacadeBean.class);
private SessionContext sessionContext;
public void ejbCreate() throws CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/CustomPrincipalBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/CustomPrincipalBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/CustomPrincipalBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
import javax.security.auth.Subject;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** Test return of a custom principal from getCallerPrincipal.
*
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/EntityBeanImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/EntityBeanImpl.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/EntityBeanImpl.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -43,7 +43,7 @@
*/
public class EntityBeanImpl implements EntityBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private String key;
private EntityContext context;
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/FacadeTargetBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/FacadeTargetBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/FacadeTargetBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.security.interfaces.StatelessSessionLocal;
import org.jboss.test.security.interfaces.StatelessSessionLocalHome;
@@ -41,7 +41,7 @@
*/
public class FacadeTargetBean implements SessionBean
{
- private static Category log = Category.getInstance(FacadeTargetBean.class);
+ private static Logger log = Logger.getLogger(FacadeTargetBean.class);
private SessionContext sessionContext;
public void ejbCreate() throws CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A simple session bean for testing custom security.
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/IOStatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import javax.ejb.EJBException;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A simple session bean for testing custom security.
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/MissingMethodBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/MissingMethodBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/MissingMethodBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -1,6 +1,6 @@
package org.jboss.test.security.ejb;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
@@ -14,7 +14,7 @@
*/
public class MissingMethodBean implements SessionBean
{
- private static Category log = Category.getInstance(MissingMethodBean.class);
+ private static Logger log = Logger.getLogger(MissingMethodBean.class);
private SessionContext sessionContext;
public void ejbCreate() throws CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsMDB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsMDB.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/RunAsMDB.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -48,7 +48,7 @@
*/
public class RunAsMDB implements MessageDrivenBean, MessageListener
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private MessageDrivenContext ctx = null;
private InitialContext iniCtx;
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/StatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/StatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A simple session bean for testing declarative security.
*
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
*/
public class StatelessSessionBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean2.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean2.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean2.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -42,7 +42,7 @@
*/
public class StatelessSessionBean2 implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean3.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean3.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean3.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -34,7 +34,7 @@
import org.jboss.test.security.interfaces.StatelessSession;
import org.jboss.test.security.interfaces.StatelessSessionHome;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/** A SessionBean that accesses an Entity bean in its echo() method to test runAs
identity propagation. It also access its own excluded() method to test that the runAs
@@ -46,7 +46,7 @@
*/
public class StatelessSessionBean3 implements SessionBean
{
- private static Category log = Category.getInstance(StatelessSessionBean3.class);
+ private static Logger log = Logger.getLogger(StatelessSessionBean3.class);
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean4.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean4.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/StatelessSessionBean4.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/** A simple session bean for testing declarative security and
the use of getCallerPrincipal in ejbCreate
@@ -38,7 +38,7 @@
*/
public class StatelessSessionBean4 implements SessionBean
{
- private static Category log = Category.getInstance(StatelessSessionBean4.class);
+ private static Logger log = Logger.getLogger(StatelessSessionBean4.class);
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/UncheckedSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/UncheckedSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/UncheckedSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** A simple session bean for testing unchecked declarative security.
Modified: trunk/testsuite/src/main/org/jboss/test/security/ejb/project/ProjRepositoryBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/ejb/project/ProjRepositoryBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/ejb/project/ProjRepositoryBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import org.jboss.test.security.ejb.project.support.HeirMemoryMap;
import org.jboss.test.security.interfaces.IProjRepository;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** The ProjRepository session bean implementation. This is a trivial
implementation that always creates the same set of project data.
Modified: trunk/testsuite/src/main/org/jboss/test/security/interceptors/ClientEncryptionInterceptor.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/interceptors/ClientEncryptionInterceptor.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/interceptors/ClientEncryptionInterceptor.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import javax.crypto.spec.IvParameterSpec;
import javax.security.auth.Subject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.invocation.Invocation;
import org.jboss.proxy.Interceptor;
@@ -50,7 +50,7 @@
/** The is initialized the first time */
private Cipher encryptCipher;
private Cipher decryptCipher;
- private Category log = Category.getInstance(ClientEncryptionInterceptor.class);
+ private Logger log = Logger.getLogger(ClientEncryptionInterceptor.class);
/** Creates a new instance of EncryptionInterceptor */
public ClientEncryptionInterceptor()
Modified: trunk/testsuite/src/main/org/jboss/test/security/proxy/ProjRepositorySecurityProxy2.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/proxy/ProjRepositorySecurityProxy2.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/proxy/ProjRepositorySecurityProxy2.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -44,7 +44,7 @@
*/
public class ProjRepositorySecurityProxy2 implements IProjRepository
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
/**
* @label bean
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/EJBSpecUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -59,7 +59,7 @@
import org.jboss.test.security.ejb.jbas1852.SessionFacade;
import org.jboss.test.security.ejb.jbas1852.SessionFacadeHome;
import org.jboss.test.util.AppCallbackHandler;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import junit.extensions.TestSetup;
import junit.framework.Test;
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/HttpsUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -47,7 +47,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestSetup;
import org.jboss.test.util.SecurityProviderUtil;
@@ -185,9 +185,9 @@
static class AcceptThread extends Thread
{
ServerSocket serverSocket;
- Category log;
+ Logger log;
Object lock;
- AcceptThread(ServerSocket serverSocket, Category log, Object lock)
+ AcceptThread(ServerSocket serverSocket, Logger log, Object lock)
{
super("AcceptThread");
super.setDaemon(true);
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -55,7 +55,7 @@
import junit.framework.TestSuite;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.logging.XLevel;
import org.jboss.security.SimpleGroup;
@@ -495,10 +495,6 @@
{
// Install the custom JAAS configuration
Configuration.setConfiguration(new TestConfig());
-
- // Turn on trace level logging
- Logger root = Logger.getRootLogger();
- root.setLevel(XLevel.TRACE);
}
public void testClientLogin() throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/RoleMappingModuleUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/RoleMappingModuleUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/RoleMappingModuleUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -40,7 +40,7 @@
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.logging.XLevel;
import org.jboss.security.SimpleGroup;
import org.jboss.security.SimplePrincipal;
@@ -131,10 +131,6 @@
{
// Install the custom JAAS configuration
Configuration.setConfiguration(new TestConfig());
-
- // Turn on trace level logging
- Logger root = Logger.getRootLogger();
- root.setLevel(XLevel.TRACE);
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/SRPLoginModuleUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/SRPLoginModuleUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/SRPLoginModuleUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.Util;
import org.jboss.security.auth.callback.AppCallbackHandler;
@@ -177,11 +177,11 @@
static class SessionThread extends Thread
{
private Throwable error;
- private Category log;
+ private Logger log;
private AppCallbackHandler handler;
private MBeanServerConnection server;
- SessionThread(Category log, AppCallbackHandler handler, MBeanServerConnection server)
+ SessionThread(Logger log, AppCallbackHandler handler, MBeanServerConnection server)
{
super("SRPSession");
this.log = log;
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/SRPUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/SRPUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/SRPUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
import org.jboss.test.JBossTestSetup;
import org.jboss.test.security.interfaces.StatelessSession;
import org.jboss.test.security.interfaces.StatelessSessionHome;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/** Test of the secure remote password(SRP) session key to perform crypto
operations.
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.security.auth.login.Configuration;
import javax.security.auth.login.AppConfigurationEntry;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.logging.XLevel;
import org.jboss.security.SecurityConstants;
@@ -64,10 +64,6 @@
config.setConfigResource("security/login-config.xml");
config.loadConfig();
Configuration.setConfiguration(config);
-
- // Turn on trace level logging
- Logger root = Logger.getRootLogger();
- root.setLevel(XLevel.TRACE);
}
public void testSecurityDomainLoginModuleOption() throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/SecurityMgrStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/SecurityMgrStressTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/SecurityMgrStressTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
import junit.textui.TestRunner;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.security.plugins.JaasSecurityManager;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.SecurityAssociation;
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/StatelessSessionClient.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/StatelessSessionClient.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/StatelessSessionClient.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -42,7 +42,7 @@
*/
public class StatelessSessionClient
{
- static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(StatelessSessionClient.class);
+ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(StatelessSessionClient.class);
static void runMT()
{
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/XMLLoginModulesUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/XMLLoginModulesUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/XMLLoginModulesUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -33,7 +33,7 @@
import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.Subject;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.logging.XLevel;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
@@ -73,10 +73,6 @@
config.setConfigResource("security/login-config.xml");
config.loadConfig();
Configuration.setConfiguration(config);
-
- // Turn on trace level logging
- Logger root = Logger.getRootLogger();
- root.setLevel(XLevel.TRACE);
}
public void testPropertyReplacement() throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/xacml/XACMLUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/xacml/XACMLUtil.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/xacml/XACMLUtil.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -47,7 +47,7 @@
import com.sun.xacml.support.finder.StaticRefPolicyFinderModule;
import com.sun.xacml.support.finder.URLPolicyFinderModule;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
//$Id$
Modified: trunk/testsuite/src/main/org/jboss/test/security/test/xacml/modules/TestRoleAttributeFinderModule.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/xacml/modules/TestRoleAttributeFinderModule.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/xacml/modules/TestRoleAttributeFinderModule.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -124,7 +124,7 @@
* Supports the retrieval of exactly one kind of attribute.
*/
public EvaluationResult findAttribute(URI attributeType, URI attributeId,
- URI issuer, URI subjectCategory,
+ URI issuer, URI subjectLogger,
EvaluationCtx context,
int designatorType)
{
@@ -141,7 +141,7 @@
// Retrieve the subject identifer from the context
EvaluationResult result =
context.getSubjectAttribute(attributeType, SUBJECT_IDENTIFIER,
- issuer, subjectCategory);
+ issuer, subjectLogger);
if (result.indeterminate())
return result;
Modified: trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/BadBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/BadBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/BadBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.ejb.SessionContext;
import javax.security.auth.Subject;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
import org.jboss.security.RunAsIdentity;
@@ -39,7 +39,7 @@
*/
public class BadBean implements SessionBean
{
- static final Category log = Category.getInstance(BadBean.class);
+ static final Logger log = Logger.getLogger(BadBean.class);
public void ejbCreate()
{
Modified: trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/IOStatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/IOStatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/securitymgr/ejb/IOStatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -34,7 +34,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
@@ -46,7 +46,7 @@
*/
public class IOStatelessSessionBean implements SessionBean
{
- static final Category log = Category.getInstance(IOStatelessSessionBean.class);
+ static final Logger log = Logger.getLogger(IOStatelessSessionBean.class);
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/securitymgr/test/PolicyUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/securitymgr/test/PolicyUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/securitymgr/test/PolicyUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.JBossTestCase;
@@ -145,7 +145,7 @@
final ServerSocket tmp = new ServerSocket(0);
log.debug("Created ServerSocket: "+tmp);
- final Category theLog = log;
+ final Logger theLog = log;
Thread t = new Thread("Acceptor")
{
public void run()
Modified: trunk/testsuite/src/main/org/jboss/test/securitymgr/test/SecurityUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/securitymgr/test/SecurityUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/securitymgr/test/SecurityUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
*/
public class SecurityUnitTestCase extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
public SecurityUnitTestCase(String name)
{
Modified: trunk/testsuite/src/main/org/jboss/test/stax/StaxTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/stax/StaxTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/stax/StaxTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -57,10 +57,10 @@
private static String getXmlUrl(String name)
{
- return getResource(name).getFile();
+ return getTCLResource(name).getFile();
}
- private static URL getResource(String name)
+ private static URL getTCLResource(String name)
{
URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource(name);
if(xmlUrl == null)
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatefulBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
public class BMTStatefulBean implements SessionBean
{
- static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(BMTStatefulBean.class);
+ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(BMTStatefulBean.class);
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatelessBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatelessBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/BMTStatelessBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
public class BMTStatelessBean implements SessionBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/EnterpriseEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/EnterpriseEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/EnterpriseEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
import org.jboss.test.testbean.interfaces.EnterpriseEntity;
public class EnterpriseEntityBean implements EntityBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private EntityContext entityContext;
public String name;
public int otherField = 0;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityBMPBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityBMPBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityBMPBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import java.util.Enumeration;
public class EntityBMPBean implements EntityBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private EntityContext entityContext;
public String name;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityPKBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityPKBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/EntityPKBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import org.jboss.test.testbean.interfaces.AComplexPK;
public class EntityPKBean implements EntityBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public boolean aBoolean;
public int anInt;
public long aLong;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
import javax.ejb.*;
public class StatefulSessionBean implements SessionBean {
- public static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(StatefulSessionBean.class);
+ public static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(StatefulSessionBean.class);
private SessionContext sessionContext;
public String name;
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/StatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
import org.jboss.test.testbean.interfaces.BusinessMethodException;
public class StatelessSessionBean implements SessionBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException {
Modified: trunk/testsuite/src/main/org/jboss/test/testbean/bean/TxSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean/bean/TxSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean/bean/TxSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -31,7 +31,7 @@
public class TxSessionBean implements SessionBean {
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException {
Modified: trunk/testsuite/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbean2/bean/AllTypesBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -41,8 +41,8 @@
public class AllTypesBean implements EntityBean {
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(AllTypesBean.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(AllTypesBean.class);
public boolean aBoolean;
public byte aByte;
Modified: trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/EntityPKBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/EntityPKBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/EntityPKBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -28,7 +28,7 @@
import javax.ejb.RemoveException;
import org.jboss.test.testbean.interfaces.AComplexPK;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/** Tests of the cluster cache invalidation framework.
* @author Scott.Stark at jboss.org
@@ -36,7 +36,7 @@
*/
public abstract class EntityPKBean implements EntityBean
{
- private static Category log = Category.getInstance(EntityPKBean.class);
+ private static Logger log = Logger.getLogger(EntityPKBean.class);
private EntityContext entityContext;
Modified: trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/SessionToEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/SessionToEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbeancluster/bean/SessionToEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import javax.ejb.SessionBean;
import javax.ejb.FinderException;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.testbean.interfaces.AComplexPK;
import org.jboss.test.testbeancluster.interfaces.EntityPK;
import org.jboss.test.testbeancluster.interfaces.EntityPKHome;
Modified: trunk/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,8 +32,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.log4j.Logger;
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.logging.Logger;
import org.jboss.proxy.ejb.RetryInterceptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.testbean.interfaces.AComplexPK;
Modified: trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByReferenceStatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByReferenceStatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByReferenceStatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
*/
public class ByReferenceStatelessSessionBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByValueStatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByValueStatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/ByValueStatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -32,7 +32,7 @@
*/
public class ByValueStatelessSessionBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/RootStatelessSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/RootStatelessSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/testbyvalue/bean/RootStatelessSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -40,7 +40,7 @@
*/
public class RootStatelessSessionBean implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
private SessionContext sessionContext;
public void ejbCreate() throws RemoteException, CreateException
Modified: trunk/testsuite/src/main/org/jboss/test/threading/ejb/EJBThreadsBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/threading/ejb/EJBThreadsBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/threading/ejb/EJBThreadsBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
*/
public class EJBThreadsBean implements EntityBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
// Constants -----------------------------------------------------
Modified: trunk/testsuite/src/main/org/jboss/test/threading/mbean/Threads.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/threading/mbean/Threads.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/threading/mbean/Threads.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -44,7 +44,7 @@
public class Threads
implements ThreadsMBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
// Constants -----------------------------------------------------
Modified: trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSFSBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSFSBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSFSBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -26,7 +26,7 @@
import javax.ejb.TimedObject;
import javax.ejb.Timer;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* Stateful Session Bean Timer Test
Modified: trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSLSBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSLSBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/timer/ejb/TimerSLSBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -38,7 +38,7 @@
import javax.management.MBeanServerFactory;
import javax.management.MBeanServer;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.timer.interfaces.TimerSLSB;
import org.jboss.ejb.txtimer.FixedDelayRetryPolicyMBean;
Modified: trunk/testsuite/src/main/org/jboss/test/txiiop/ejb/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/txiiop/ejb/StatefulSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/txiiop/ejb/StatefulSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -35,7 +35,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
import org.jboss.test.cts.interfaces.BeanContextInfo;
import org.jboss.test.cts.interfaces.CtsCmpLocal;
import org.jboss.test.cts.interfaces.CtsCmpLocalHome;
@@ -56,7 +56,7 @@
extends SessionSupport
implements SessionSynchronization
{
- private static transient Category log = Category.getInstance(StatefulSessionBean.class);
+ private static transient Logger log = Logger.getLogger(StatefulSessionBean.class);
private transient int counterAtTxStart;
private String testName;
private int counter;
@@ -64,7 +64,7 @@
public void ejbCreate(String testName)
{
this.testName = testName;
- log = Category.getInstance(StatefulSessionBean.class.getName()+"#"+testName);
+ log = Logger.getLogger(StatefulSessionBean.class.getName()+"#"+testName);
log.debug("ejbCreate("+testName+"), ctx="+sessionCtx);
}
Modified: trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerEntityBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerEntityBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -39,7 +39,7 @@
import javax.ejb.Timer;
import javax.ejb.TimerService;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* Entity Bean Timer Test
Modified: trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerFacadeBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerFacadeBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerFacadeBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.txtimer.interfaces.TimerEntity;
import org.jboss.test.txtimer.interfaces.TimerEntityHome;
import org.jboss.test.txtimer.interfaces.TimerSession;
Modified: trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerSessionBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/txtimer/ejb/TimerSessionBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -37,7 +37,7 @@
import javax.ejb.Timer;
import javax.ejb.TimerService;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
/**
* Session Bean Timer Test
Modified: trunk/testsuite/src/main/org/jboss/test/util/ejb/SessionSupport.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/ejb/SessionSupport.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/util/ejb/SessionSupport.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import javax.ejb.SessionBean;
import javax.ejb.SessionContext;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Simple SessionBean support base class
@@ -39,7 +39,7 @@
*/
public abstract class SessionSupport implements SessionBean
{
- protected transient Category log = Category.getInstance(getClass());
+ protected transient Logger log = Logger.getLogger(getClass());
protected SessionContext sessionCtx;
@@ -72,6 +72,6 @@
private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
{
// reset logging
- log = Category.getInstance(getClass());
+ log = Logger.getLogger(getClass());
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolRunnableUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolRunnableUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolRunnableUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -29,7 +29,7 @@
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.ThreadPoolFullException;
import org.jboss.util.threadpool.BlockingMode;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import junit.framework.TestCase;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolTaskUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolTaskUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/util/test/ThreadPoolTaskUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -27,7 +27,7 @@
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.Task;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import junit.framework.TestCase;
/**
Modified: trunk/testsuite/src/main/org/jboss/test/web/interfaces/EntityPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/interfaces/EntityPK.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/interfaces/EntityPK.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -25,7 +25,7 @@
public class EntityPK implements java.io.Serializable
{
- static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(EntityPK.class);
+ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(EntityPK.class);
public int the_key;
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -36,7 +36,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.web.util.EJBManifestClass;
import org.jboss.test.web.util.EarLibUser;
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/EJBOnStartupServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/EJBOnStartupServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/EJBOnStartupServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -47,7 +47,7 @@
*/
public class EJBOnStartupServlet extends HttpServlet
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
StatelessSessionHome home;
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/ENCServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/ENCServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/ENCServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -54,7 +54,7 @@
*/
public class ENCServlet extends HttpServlet
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/SecureEJBServletMT.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/SecureEJBServletMT.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/SecureEJBServletMT.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -46,7 +46,7 @@
*/
public class SecureEJBServletMT extends HttpServlet
{
- static org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(SecureEJBServletMT.class);
+ static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(SecureEJBServletMT.class);
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/StatefulSessionServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/StatefulSessionServlet.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/StatefulSessionServlet.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -34,7 +34,7 @@
import javax.servlet.http.HttpSessionActivationListener;
import javax.servlet.http.HttpSessionEvent;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.test.web.interfaces.StatelessSession;
import org.jboss.test.web.interfaces.StatelessSessionHome;
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -30,7 +30,7 @@
import org.apache.commons.httpclient.HttpState;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Base class for tests of web app single sign-on
@@ -46,7 +46,7 @@
*/
protected static void executeFormAuthSingleSignOnTest(String serverA,
String serverB,
- Category log)
+ Logger log)
throws Exception
{
// Start by accessing the secured index.html of war1
Modified: trunk/testsuite/src/main/org/jboss/test/web/util/Util.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/util/Util.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/web/util/Util.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -44,8 +44,8 @@
*/
public class Util
{
- static org.apache.log4j.Category log =
- org.apache.log4j.Category.getInstance(Util.class);
+ static org.jboss.logging.Logger log =
+ org.jboss.logging.Logger.getLogger(Util.class);
public static String getTime()
{
Modified: trunk/testsuite/src/main/org/jboss/test/xa/bean/XATestBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/xa/bean/XATestBean.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/xa/bean/XATestBean.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -38,7 +38,7 @@
public class XATestBean
implements SessionBean
{
- org.apache.log4j.Category log = org.apache.log4j.Category.getInstance(getClass());
+ org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(getClass());
public final static String DROP_TABLE =
"DROP TABLE XA_TEST";
Modified: trunk/testsuite/src/main/org/jboss/test/xa/test/XAUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/xa/test/XAUnitTestCase.java 2006-11-04 08:39:37 UTC (rev 58114)
+++ trunk/testsuite/src/main/org/jboss/test/xa/test/XAUnitTestCase.java 2006-11-04 08:42:14 UTC (rev 58115)
@@ -50,7 +50,7 @@
public class XAUnitTestCase
extends JBossTestCase
{
- org.apache.log4j.Category log = getLog();
+ org.jboss.logging.Logger log = getLog();
public XAUnitTestCase(String name)
{
super(name);
More information about the jboss-cvs-commits
mailing list