Author: alessio.soldano(a)jboss.com Date: 2013-05-16 06:41:19 -0400 (Thu, 16 May 2013) New Revision: 17588 Added: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java Removed: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java Log: [JBWS-3636] Move JBossWSCXFTestSetup to common area Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2013-05-16 10:29:30 UTC (rev 17587) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2013-05-16 10:41:19 UTC (rev 17588) @@ -1,111 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.test; - -import junit.framework.Test; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.jboss.logging.Logger; -import org.jboss.wsf.test.JBossWSTestSetup; - -public class JBossWSCXFTestSetup extends JBossWSTestSetup -{ - private Bus defaultBus; - - public JBossWSCXFTestSetup(Class<?> testClass, String archiveList) - { - super(testClass, archiveList); - } - - public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) - { - super(testClass, archiveList, requiresDefaultSecurityDomain); - } - - public JBossWSCXFTestSetup(Test test, String archiveList) - { - super(test, archiveList); - } - - public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) - { - super(test, archiveList, requiresDefaultSecurityDomain); - } - - public JBossWSCXFTestSetup(Test test) - { - super(test); - } - - @Override - protected void setUp() throws Exception { - defaultBus = BusFactory.getDefaultBus(false); - super.setUp(); - Bus threadBus = BusFactory.getThreadDefaultBus(false); - if (threadBus != null) - { - ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); - ClassLoader origLoader = this.getOriginalClassLoader(); - //overwrite the ClassLoader extension with the new TCCL, to allow CXF seeing the client side archives - if (busLoader != null && busLoader == origLoader) - { - threadBus.setExtension(Thread.currentThread().getContextClassLoader(), ClassLoader.class); - } - } - } - - @Override - protected void tearDown() throws Exception { - Bus threadBus = BusFactory.getThreadDefaultBus(false); - if (threadBus != null) - { - ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); - ClassLoader origLoader = this.getOriginalClassLoader(); - //restore the ClassLoader extension to the orig loader - if (busLoader != null && busLoader == Thread.currentThread().getContextClassLoader()) - { - threadBus.setExtension(origLoader, ClassLoader.class); - } - } - - try - { - Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false); - - if (defaultBus == null && afterTestsDefaultBus != null) - { - Logger.getLogger(this.getClass()).info("Default CXF bus has been set during test execution"); - } - else if (defaultBus != afterTestsDefaultBus) - { - throw new Exception("CXF Default bus changed during test: \nBEFORE: " + defaultBus + "\nAFTER: " - + afterTestsDefaultBus); - } - } - finally - { - defaultBus = null; //remove reference, to help GC - super.tearDown(); - } - } -} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2013-05-16 10:29:30 UTC (rev 17587) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2013-05-16 10:41:19 UTC (rev 17588) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.test; - -import junit.framework.Test; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.jboss.logging.Logger; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * - * @author alessio.soldano(a)jboss.com - */ -public class JBossWSCXFTestSetup extends JBossWSTestSetup -{ - private Bus defaultBus; - - public JBossWSCXFTestSetup(Class<?> testClass, String archiveList) - { - super(testClass, archiveList); - } - - public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) - { - super(testClass, archiveList, requiresDefaultSecurityDomain); - } - - public JBossWSCXFTestSetup(Test test, String archiveList) - { - super(test, archiveList); - } - - public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) - { - super(test, archiveList, requiresDefaultSecurityDomain); - } - - public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain, CleanupOperation cleanupOp) - { - super(testClass, archiveList, requiresDefaultSecurityDomain, cleanupOp); - } - - public JBossWSCXFTestSetup(Test test) - { - super(test); - } - - @Override - protected void setUp() throws Exception { - defaultBus = BusFactory.getDefaultBus(false); - super.setUp(); - Bus threadBus = BusFactory.getThreadDefaultBus(false); - if (threadBus != null) - { - ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); - ClassLoader origLoader = this.getOriginalClassLoader(); - //overwrite the ClassLoader extension with the new TCCL, to allow CXF seeing the client side archives - if (busLoader != null && busLoader == origLoader) - { - threadBus.setExtension(Thread.currentThread().getContextClassLoader(), ClassLoader.class); - } - } - } - - @Override - protected void tearDown() throws Exception { - Bus threadBus = BusFactory.getThreadDefaultBus(false); - if (threadBus != null) - { - ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); - ClassLoader origLoader = this.getOriginalClassLoader(); - //restore the ClassLoader extension to the orig loader - if (busLoader != null && busLoader == Thread.currentThread().getContextClassLoader()) - { - threadBus.setExtension(origLoader, ClassLoader.class); - } - } - - try - { - Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false); - - if (defaultBus == null && afterTestsDefaultBus != null) - { - Logger.getLogger(this.getClass()).info("Default CXF bus has been set during test execution"); - } - else if (defaultBus != afterTestsDefaultBus) - { - throw new Exception("CXF Default bus changed during test: \nBEFORE: " + defaultBus + "\nAFTER: " - + afterTestsDefaultBus); - } - } - finally - { - defaultBus = null; //remove reference, to help GC - super.tearDown(); - } - } -} Added: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2013-05-16 10:41:19 UTC (rev 17588) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.test; + +import junit.framework.Test; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.jboss.logging.Logger; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * + * @author alessio.soldano(a)jboss.com + */ +public class JBossWSCXFTestSetup extends JBossWSTestSetup +{ + private Bus defaultBus; + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList) + { + super(testClass, archiveList); + } + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(testClass, archiveList, requiresDefaultSecurityDomain); + } + + public JBossWSCXFTestSetup(Test test, String archiveList) + { + super(test, archiveList); + } + + public JBossWSCXFTestSetup(Test test, String archiveList, boolean requiresDefaultSecurityDomain) + { + super(test, archiveList, requiresDefaultSecurityDomain); + } + + public JBossWSCXFTestSetup(Class<?> testClass, String archiveList, boolean requiresDefaultSecurityDomain, CleanupOperation cleanupOp) + { + super(testClass, archiveList, requiresDefaultSecurityDomain, cleanupOp); + } + + public JBossWSCXFTestSetup(Test test) + { + super(test); + } + + @Override + protected void setUp() throws Exception { + defaultBus = BusFactory.getDefaultBus(false); + super.setUp(); + Bus threadBus = BusFactory.getThreadDefaultBus(false); + if (threadBus != null) + { + ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); + ClassLoader origLoader = this.getOriginalClassLoader(); + //overwrite the ClassLoader extension with the new TCCL, to allow CXF seeing the client side archives + if (busLoader != null && busLoader == origLoader) + { + threadBus.setExtension(Thread.currentThread().getContextClassLoader(), ClassLoader.class); + } + } + } + + @Override + protected void tearDown() throws Exception { + Bus threadBus = BusFactory.getThreadDefaultBus(false); + if (threadBus != null) + { + ClassLoader busLoader = threadBus.getExtension(ClassLoader.class); + ClassLoader origLoader = this.getOriginalClassLoader(); + //restore the ClassLoader extension to the orig loader + if (busLoader != null && busLoader == Thread.currentThread().getContextClassLoader()) + { + threadBus.setExtension(origLoader, ClassLoader.class); + } + } + + try + { + Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false); + + if (defaultBus == null && afterTestsDefaultBus != null) + { + Logger.getLogger(this.getClass()).info("Default CXF bus has been set during test execution"); + } + else if (defaultBus != afterTestsDefaultBus) + { + throw new Exception("CXF Default bus changed during test: \nBEFORE: " + defaultBus + "\nAFTER: " + + afterTestsDefaultBus); + } + } + finally + { + defaultBus = null; //remove reference, to help GC + super.tearDown(); + } + } +}