Author: asoldano Date: 2014-06-26 04:15:44 -0400 (Thu, 26 Jun 2014) New Revision: 18766 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: [JBWS-3711] Fix regression Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.test.ws.management.recording; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class ArchiveDeployment +{ + public static final String NAME = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.management.recording.Endpoint.class) + .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); + } + }); + + private ArchiveDeployment() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -49,13 +49,13 @@ protected void setUp() throws Exception { endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); + JBossWSTestHelper.deploy(ArchiveDeployment.NAME); } @Override protected void tearDown() throws Exception { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); + JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); } public void testAddCustomProcessor() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -32,7 +32,6 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.api.monitoring.Record; import org.jboss.ws.api.monitoring.RecordFilter; import org.jboss.ws.common.monitoring.AndFilter; @@ -54,28 +53,17 @@ private final String targetNS = "http://recording.management.ws.test.jboss.org/"; private String endpointObjectName; - static { - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.management.recording.Endpoint.class) - .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); - } - }); - } - @Override protected void setUp() throws Exception { endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); + JBossWSTestHelper.deploy(ArchiveDeployment.NAME); } @Override protected void tearDown() throws Exception { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); + JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); } public void testRecording() throws Exception