[jbossws-commits] JBossWS SVN: r9842 - in stack/native/trunk: modules/testsuite and 12 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-04-20 05:31:15 -0400 (Mon, 20 Apr 2009) New Revision: 9842 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/ Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt stack/native/trunk/pom.xml Log: [JBWS-2612] removing AS 4x support Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-04-20 09:31:15 UTC (rev 9842) @@ -103,21 +103,12 @@ <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponseMessageBean.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-as4.sar"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-samples-dar-jms-client.war"/> - <include name="jaxws-samples-dar-jms-client.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss4x/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.sar"> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-dar-jms-client.war"/> <include name="jaxws-samples-dar-jms-client.jar"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss5x/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -129,19 +120,11 @@ <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as4.sar"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-samples-jmstransport.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss4x/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar"> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-jmstransport.jar"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss5x/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -196,27 +179,6 @@ <include name="wsse10.truststore"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-newspaper-as5.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="bob-sign_enc.jks"/> - <include name="wsse10.truststore"/> - </metainf> - </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-agency-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -165,10 +165,7 @@ { stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured"); port.getContactInfo("mafia"); - - if (isTargetJBoss5()) - System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); - else fail("Security exception expected"); + fail("Security exception expected"); } catch (RemoteException ignore) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -147,9 +147,7 @@ stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured"); port.getContactInfo("mafia"); - if (isTargetJBoss5()) - System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); - else fail("Security exception expected"); + fail("Security exception expected"); } catch (RemoteException ignore) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -21,11 +21,8 @@ */ package org.jboss.test.ws.jaxrpc.samples.wssecurity; -import java.io.File; import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; -import javax.xml.rpc.Service; import javax.xml.rpc.Stub; import junit.framework.Test; @@ -50,30 +47,17 @@ return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); } - public void setUp() throws Exception { - if (port == null) - { - if (isTargetJBoss42()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - port = (Hello)service.getPort(Hello.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl"); - URL mappingURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml"); - URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml"); - QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL); - port = (Hello)service.getPort(Hello.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt"); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - } - } + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl"); + URL mappingURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml"); + URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml"); + QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL); + port = (Hello)service.getPort(Hello.class); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt"); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); } public void testEndpoint() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -29,7 +29,6 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.wsf.common.IOUtils; @@ -73,15 +72,8 @@ // Maybe you should extend the Class-Path in the MANIFEST instead. StringBuffer cp = new StringBuffer(System.getProperty("test.classes.directory")); cp.append(PS + jbc + FS + "jbossws-native-client.jar"); - if (isTargetJBoss5OrGreater()) - { - cp.append(PS + jbc + FS + "jboss-common-core.jar"); - cp.append(PS + jbc + FS + "jboss-logging-spi.jar"); - } - else - { - cp.append(PS + jbc + FS + "jboss-common-client.jar"); - } + cp.append(PS + jbc + FS + "jboss-common-core.jar"); + cp.append(PS + jbc + FS + "jboss-logging-spi.jar"); Runtime rt = Runtime.getRuntime(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -31,13 +31,9 @@ import junit.framework.Test; -import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; /** * Invokes the DAR JMS client @@ -51,8 +47,7 @@ public static Test suite() { - String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : ""; - return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client" + suffix + ".sar,jaxws-samples-dar-jms.jar"); + return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client.sar,jaxws-samples-dar-jms.jar"); } public void test() throws Exception @@ -82,26 +77,7 @@ private int getMessageCount(String queue) throws Exception { ObjectName oname = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=" + queue); - if (isTargetJBoss5OrGreater()) - { - return (Integer)getServer().getAttribute(oname, "MessageCount"); - } - else - { - String result = (String)getServer().invoke(oname, "listMessageCounter", null, null); - Element table = DOMUtils.parse(result); - NodeList ths = table.getFirstChild().getChildNodes(); - int p = -1; - for (int i=0; i<ths.getLength(); i++) - { - if (ths.item(i).getTextContent().equalsIgnoreCase("Count")) - p = i; - } - if (p == -1) - throw new Exception("Cannot read the queue message count!"); - String count = table.getLastChild().getChildNodes().item(p).getTextContent(); - return Integer.parseInt(count); - } + return (Integer)getServer().getAttribute(oname, "MessageCount"); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -38,7 +38,6 @@ import javax.xml.ws.Service; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.wsf.common.DOMUtils; @@ -56,8 +55,7 @@ public static Test suite() throws Exception { - String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : ""; - return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport" + suffix + ".sar"); + return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar"); } public void testJMSEndpointPort() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -24,7 +24,6 @@ import java.net.URL; import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,11 +38,10 @@ { public static Test suite() { - String newspaperJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar"; return new JBossWSTestSetup ( SecureNewsTestCase.class, - newspaperJar + ", jaxws-samples-news-step2-agency-client.jar" + "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar" ); } Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jaxws.samples.news; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.BindingType; - -import org.jboss.ejb3.annotation.SecurityDomain; -import org.jboss.wsf.spi.annotation.AuthMethod; -import org.jboss.wsf.spi.annotation.TransportGuarantee; -import org.jboss.wsf.spi.annotation.WebContext; - -@Stateless -@SecurityDomain("JBossWS") -@SOAPBinding -( - style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL -) -@WebService -( - name = "NewspaperMTOMEndpoint", - serviceName = "NewspaperMTOMService", - targetNamespace = "http://org.jboss.ws/samples/news", - endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperMTOM" -) -@WebContext -( - contextRoot = "/news", - urlPattern = "/newspaper/mtom", - authMethod = AuthMethod.BASIC, - transportGuarantee = TransportGuarantee.CONFIDENTIAL, - secureWSDLAccess = false -) -@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public class SecureNewspaperMTOMAS5Endpoint extends AbstractNewspaperMTOMEndpoint implements NewspaperMTOM -{ - -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -26,7 +26,7 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.BindingType; -import org.jboss.annotation.security.SecurityDomain; +import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.wsf.spi.annotation.AuthMethod; import org.jboss.wsf.spi.annotation.TransportGuarantee; import org.jboss.wsf.spi.annotation.WebContext; Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jaxws.samples.news; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.AuthMethod; -import org.jboss.wsf.spi.annotation.TransportGuarantee; -import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.ejb3.annotation.SecurityDomain; - -@Stateless -@SecurityDomain("JBossWS") -@SOAPBinding -( - style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL -) -@WebService -( - name = "NewspaperSWAEndpoint", - serviceName = "NewspaperSWAService", - targetNamespace = "http://org.jboss.ws/samples/news", - endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperSWA" -) -@WebContext -( - contextRoot = "/news", - urlPattern = "/newspaper/swa", - authMethod = AuthMethod.BASIC, - transportGuarantee = TransportGuarantee.CONFIDENTIAL, - secureWSDLAccess = false -) -public class SecureNewspaperSWAAS5Endpoint extends AbstractNewspaperSWAEndpoint implements NewspaperSWA -{ - -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2009-04-20 09:31:15 UTC (rev 9842) @@ -28,7 +28,7 @@ import org.jboss.wsf.spi.annotation.AuthMethod; import org.jboss.wsf.spi.annotation.TransportGuarantee; import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.annotation.security.SecurityDomain; +import org.jboss.ejb3.annotation.SecurityDomain; @Stateless @SecurityDomain("JBossWS") Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml 2009-04-20 09:31:15 UTC (rev 9842) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarRequestQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml 2009-04-20 09:31:15 UTC (rev 9842) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<server> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=RequestQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> + <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=ResponseQueue"> + <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> + </mbean> +</server> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,8 +1,3 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* - # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,8 +1,3 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* - # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,8 +1,3 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* - # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 09:31:15 UTC (rev 9842) @@ -1,8 +1,3 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* - # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-04-20 08:18:56 UTC (rev 9841) +++ stack/native/trunk/pom.xml 2009-04-20 09:31:15 UTC (rev 9842) @@ -47,7 +47,7 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.0.10.GA</jbossws.common.version> + <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.1.1.GA</jbossws.spi.version> <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>