JBossWS SVN: r7111 - in stack/native/trunk/modules/testsuite/native-tests/src/test: resources/jaxrpc/jbws723/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-20 10:20:31 -0400 (Tue, 20 May 2008)
New Revision: 7111
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/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml
Log:
don't share EJB names with jaxrpc/samples/secureejb test case
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 2008-05-20 13:43:20 UTC (rev 7110)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2008-05-20 14:20:31 UTC (rev 7111)
@@ -93,7 +93,7 @@
public void testBasicSecuredSLSB() throws Exception
{
InitialContext iniCtx = getInitialContext();
- OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
+ OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/JBWS723BasicSecuredSLSB");
OrganizationRemote bean = home.create();
String info = bean.getContactInfo("mafia");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2008-05-20 13:43:20 UTC (rev 7110)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2008-05-20 14:20:31 UTC (rev 7111)
@@ -7,7 +7,7 @@
<enterprise-beans>
<session>
- <ejb-name>RoleSecuredSLSB</ejb-name>
+ <ejb-name>JBWS723RoleSecuredSLSB</ejb-name>
<home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
@@ -19,7 +19,7 @@
</security-role-ref>
</session>
<session>
- <ejb-name>BasicSecuredSLSB</ejb-name>
+ <ejb-name>JBWS723BasicSecuredSLSB</ejb-name>
<home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
@@ -28,7 +28,7 @@
<transaction-type>Container</transaction-type>
</session>
<session>
- <ejb-name>ConfidentialSLSB</ejb-name>
+ <ejb-name>JBWS723ConfidentialSLSB</ejb-name>
<home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
@@ -45,21 +45,21 @@
<method-permission>
<role-name>friend</role-name>
<method>
- <ejb-name>RoleSecuredSLSB</ejb-name>
+ <ejb-name>JBWS723RoleSecuredSLSB</ejb-name>
<method-name>*</method-name>
</method>
</method-permission>
<method-permission>
<unchecked/>
<method>
- <ejb-name>BasicSecuredSLSB</ejb-name>
+ <ejb-name>JBWS723BasicSecuredSLSB</ejb-name>
<method-name>*</method-name>
</method>
</method-permission>
<method-permission>
<unchecked/>
<method>
- <ejb-name>ConfidentialSLSB</ejb-name>
+ <ejb-name>JBWS723ConfidentialSLSB</ejb-name>
<method-name>*</method-name>
</method>
</method-permission>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2008-05-20 13:43:20 UTC (rev 7110)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2008-05-20 14:20:31 UTC (rev 7111)
@@ -8,8 +8,8 @@
<enterprise-beans>
<session>
- <ejb-name>RoleSecuredSLSB</ejb-name>
- <jndi-name>ejb/RoleSecuredSLSB</jndi-name>
+ <ejb-name>JBWS723RoleSecuredSLSB</ejb-name>
+ <jndi-name>ejb/JBWS723RoleSecuredSLSB</jndi-name>
<port-component>
<port-component-name>RoleSecured</port-component-name>
<port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri>
@@ -19,8 +19,8 @@
</port-component>
</session>
<session>
- <ejb-name>BasicSecuredSLSB</ejb-name>
- <jndi-name>ejb/BasicSecuredSLSB</jndi-name>
+ <ejb-name>JBWS723BasicSecuredSLSB</ejb-name>
+ <jndi-name>ejb/JBWS723BasicSecuredSLSB</jndi-name>
<port-component>
<port-component-name>BasicSecured</port-component-name>
<port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri>
@@ -30,8 +30,8 @@
</port-component>
</session>
<session>
- <ejb-name>ConfidentialSLSB</ejb-name>
- <jndi-name>ejb/ConfidentialSLSB</jndi-name>
+ <ejb-name>JBWS723ConfidentialSLSB</ejb-name>
+ <jndi-name>ejb/JBWS723ConfidentialSLSB</jndi-name>
<port-component>
<port-component-name>ConfidentialSecured</port-component-name>
<port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml 2008-05-20 13:43:20 UTC (rev 7110)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml 2008-05-20 14:20:31 UTC (rev 7111)
@@ -15,7 +15,7 @@
<wsdl-port>impl:RoleSecuredPort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface>
<service-impl-bean>
- <ejb-link>RoleSecuredSLSB</ejb-link>
+ <ejb-link>JBWS723RoleSecuredSLSB</ejb-link>
</service-impl-bean>
</port-component>
<port-component>
@@ -23,7 +23,7 @@
<wsdl-port>impl:BasicSecuredPort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface>
<service-impl-bean>
- <ejb-link>BasicSecuredSLSB</ejb-link>
+ <ejb-link>JBWS723BasicSecuredSLSB</ejb-link>
</service-impl-bean>
</port-component>
<port-component>
@@ -31,7 +31,7 @@
<wsdl-port>impl:ConfidentialPort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface>
<service-impl-bean>
- <ejb-link>ConfidentialSLSB</ejb-link>
+ <ejb-link>JBWS723ConfidentialSLSB</ejb-link>
</service-impl-bean>
</port-component>
</webservice-description>
16 years, 8 months
JBossWS SVN: r7110 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-20 09:43:20 -0400 (Tue, 20 May 2008)
New Revision: 7110
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java
Log:
Don't share the port among tests
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-05-20 13:28:50 UTC (rev 7109)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-05-20 13:43:20 UTC (rev 7110)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.jbws1840;
+// $Id: $
+
import java.net.URL;
import java.util.Map;
@@ -46,31 +48,22 @@
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1840";
- private static SecureEndpoint port;
-
public static Test suite()
{
return new JBossWSTestSetup(JBWS1840TestCase.class, "jaxws-jbws1840.jar");
}
- protected void setUp() throws Exception
+ private SecureEndpoint getPort() throws Exception
{
- if (port == null)
- {
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws1840", "SecureEndpointService");
- port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class);
- }
+ SecureEndpoint port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class);
+ return port;
}
- public void testBothScenarios() throws Exception
+ public void testNegative() throws Exception
{
- _testNegative();
- _testPositive();
- }
-
- public void _testNegative()
- {
+ SecureEndpoint port = getPort();
try
{
port.echo("Hello");
@@ -82,8 +75,10 @@
}
}
- public void _testPositive()
+ public void testPositive() throws Exception
{
+ SecureEndpoint port = getPort();
+
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
16 years, 8 months
JBossWS SVN: r7109 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-20 09:28:50 -0400 (Tue, 20 May 2008)
New Revision: 7109
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
Log:
rollback
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 2008-05-20 13:06:51 UTC (rev 7108)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2008-05-20 13:28:50 UTC (rev 7109)
@@ -52,25 +52,15 @@
return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar");
}
- public void testAllScenarios() throws Exception
+ public void testRoleSecuredWSDLAccess() throws Exception
{
- _testRoleSecuredWSDLAccess();
- _testRoleSecuredServiceAccess();
- _testBasicSecuredSLSB();
- _testBasicSecuredServiceAccess();
- _testConfidentialSecuredWSDLAccess();
- _testConfidentialServiceAccess();
- }
-
- public void _testRoleSecuredWSDLAccess() throws Exception
- {
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/RoleSecured?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdl = factory.parse(wsdlURL);
assertNotNull("Expect unsecured wsdl access by default for jaxrpc", wsdl);
}
- public void _testRoleSecuredServiceAccess() throws Exception
+ public void testRoleSecuredServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
@@ -97,7 +87,7 @@
/** Test that the remote access to this bean is unchecked
*/
- public void _testBasicSecuredSLSB() throws Exception
+ public void testBasicSecuredSLSB() throws Exception
{
InitialContext iniCtx = getInitialContext();
OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
@@ -107,7 +97,7 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- public void _testBasicSecuredServiceAccess() throws Exception
+ public void testBasicSecuredServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
@@ -132,7 +122,7 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- public void _testConfidentialSecuredWSDLAccess() throws Exception
+ public void testConfidentialSecuredWSDLAccess() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
@@ -140,7 +130,7 @@
assertNotNull("Expect unsecured wsdl access", wsdl);
}
- public void _testConfidentialServiceAccess() throws Exception
+ public void testConfidentialServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured");
16 years, 8 months
JBossWS SVN: r7108 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/jaxws/samples/wssecurity and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-05-20 09:06:51 -0400 (Tue, 20 May 2008)
New Revision: 7108
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.java
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
Log:
[JBPAPP-848] Optional SOAP Header element is required by WSSecurityHandlerServer handler.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-20 12:43:23 UTC (rev 7107)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-20 13:06:51 UTC (rev 7108)
@@ -112,7 +112,7 @@
SOAPHeader soapHeader = soapMessage.getSOAPHeader();
QName secQName = new QName(Constants.WSSE_NS, "Security");
- Element secHeaderElement = Util.findElement(soapHeader, secQName);
+ Element secHeaderElement = (soapHeader != null) ? Util.findElement(soapHeader, secQName) : null;
if (secHeaderElement == null)
{
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.java (from rev 5759, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/MissingSecurityTestCase.java 2008-05-20 13:06:51 UTC (rev 7108)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wssecurity;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test WS-Security server implementation behavior
+ * when WS-Security is not used on client side
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Feb-2008
+ */
+public class MissingSecurityTestCase extends JBossWSTest
+{
+ private String endpointUrl = "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign";
+
+ /** Deploy the test */
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(MissingSecurityTestCase.class, "jaxws-samples-wssecurity-sign.war");
+ }
+
+ public void testNoSOAPHeader() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+
+ String reqEnv =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Body>" +
+ " <ns1:echoUserType xmlns:ns1='http://org.jboss.ws/samples/wssecurity'>" +
+ " <user><msg>Kermit</msg></user>" +
+ " </ns1:echoUserType>" +
+ " </env:Body>" +
+ "</env:Envelope>";
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
+
+ URL epURL = new URL(endpointUrl);
+ SOAPMessage resMsg = con.call(reqMsg, epURL);
+
+ SOAPFault fault = resMsg.getSOAPBody().getFault();
+ assertTrue(fault.getFaultString().contains("This service requires <wsse:Security>, which is missing."));
+ }
+
+ public void testNoSecurityHeader() throws Exception
+ {
+ Hello hello = getPort();
+ UserType in0 = new UserType();
+ in0.setMsg("Kermit");
+ try
+ {
+ hello.echoUserType(in0);
+ fail("Exception about missing security header expected");
+ }
+ catch (SOAPFaultException e)
+ {
+ assertTrue(e.getMessage().contains("This service requires <wsse:Security>, which is missing."));
+ }
+ catch (Exception e)
+ {
+ fail("Exception about missing security header expected");
+ }
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
+ QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Hello port = (Hello)service.getPort(Hello.class);
+
+ Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
+ reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointUrl);
+
+ return port;
+ }
+}
16 years, 8 months
JBossWS SVN: r7107 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-20 08:43:23 -0400 (Tue, 20 May 2008)
New Revision: 7107
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
FIXME [JBWS-2175] wsconsume cannot run with jaxws-api from build output
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-20 12:30:59 UTC (rev 7106)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-20 12:43:23 UTC (rev 7107)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
+// $Id$
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
@@ -43,7 +45,6 @@
* NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
- * @version $Revision$
*/
public class WSConsumerTestCase extends JBossWSTest
{
@@ -297,6 +298,12 @@
*/
public void testSOAP12Extension() throws Exception
{
+ if (isIntegrationNative())
+ {
+ System.out.println("FIXME [JBWS-2175] wsconsume cannot run with jaxws-api from build output");
+ return;
+ }
+
consumer.setOutputDirectory(outputDirectory);
consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
consumer.setGenerateSource(true);
16 years, 8 months
JBossWS SVN: r7106 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-20 08:30:59 -0400 (Tue, 20 May 2008)
New Revision: 7106
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
Log:
don't rely on fact methods are called in order they are declared - this is wrong assumption :(
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 2008-05-20 12:05:42 UTC (rev 7105)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2008-05-20 12:30:59 UTC (rev 7106)
@@ -51,8 +51,18 @@
{
return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar");
}
+
+ public void testAllScenarios() throws Exception
+ {
+ _testRoleSecuredWSDLAccess();
+ _testRoleSecuredServiceAccess();
+ _testBasicSecuredSLSB();
+ _testBasicSecuredServiceAccess();
+ _testConfidentialSecuredWSDLAccess();
+ _testConfidentialServiceAccess();
+ }
- public void testRoleSecuredWSDLAccess() throws Exception
+ public void _testRoleSecuredWSDLAccess() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/RoleSecured?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
@@ -60,7 +70,7 @@
assertNotNull("Expect unsecured wsdl access by default for jaxrpc", wsdl);
}
- public void testRoleSecuredServiceAccess() throws Exception
+ public void _testRoleSecuredServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
@@ -87,7 +97,7 @@
/** Test that the remote access to this bean is unchecked
*/
- public void testBasicSecuredSLSB() throws Exception
+ public void _testBasicSecuredSLSB() throws Exception
{
InitialContext iniCtx = getInitialContext();
OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
@@ -97,7 +107,7 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- public void testBasicSecuredServiceAccess() throws Exception
+ public void _testBasicSecuredServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
@@ -122,7 +132,7 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- public void testConfidentialSecuredWSDLAccess() throws Exception
+ public void _testConfidentialSecuredWSDLAccess() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
@@ -130,7 +140,7 @@
assertNotNull("Expect unsecured wsdl access", wsdl);
}
- public void testConfidentialServiceAccess() throws Exception
+ public void _testConfidentialServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured");
16 years, 8 months
JBossWS SVN: r7105 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-20 08:05:42 -0400 (Tue, 20 May 2008)
New Revision: 7105
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java
Log:
don't rely on fact methods are called in order they are declared - this is wrong assumption :(
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-05-20 11:44:13 UTC (rev 7104)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-05-20 12:05:42 UTC (rev 7105)
@@ -62,8 +62,14 @@
port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class);
}
}
+
+ public void testBothScenarios() throws Exception
+ {
+ _testNegative();
+ _testPositive();
+ }
- public void testNegative()
+ public void _testNegative()
{
try
{
@@ -76,7 +82,7 @@
}
}
- public void testPositive()
+ public void _testPositive()
{
Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit");
@@ -84,6 +90,5 @@
String retObj = port.echo("Hello");
assertEquals("Hello", retObj);
-
}
}
16 years, 8 months
JBossWS SVN: r7104 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-20 07:44:13 -0400 (Tue, 20 May 2008)
New Revision: 7104
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Rollback: JBWS-2175 test exclusion
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-20 11:05:08 UTC (rev 7103)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-20 11:44:13 UTC (rev 7104)
@@ -25,5 +25,3 @@
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-20 11:05:08 UTC (rev 7103)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-20 11:44:13 UTC (rev 7104)
@@ -37,5 +37,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-20 11:05:08 UTC (rev 7103)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-20 11:44:13 UTC (rev 7104)
@@ -21,5 +21,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-20 11:05:08 UTC (rev 7103)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-20 11:44:13 UTC (rev 7104)
@@ -30,5 +30,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-20 11:05:08 UTC (rev 7103)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-20 11:44:13 UTC (rev 7104)
@@ -69,6 +69,3 @@
# [JBWS-2171] JBossClientMetaData.class not found
org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*
-
-# [JBWS-2175] wsconsume cannot run with jaxws-api from build output
-org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*
16 years, 8 months
JBossWS SVN: r7103 - stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-20 07:05:08 -0400 (Tue, 20 May 2008)
New Revision: 7103
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt
Log:
Fixing readme.txt
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt 2008-05-20 11:00:20 UTC (rev 7102)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt 2008-05-20 11:05:08 UTC (rev 7103)
@@ -24,6 +24,16 @@
--------------------------------------------------------------------------------------
> keytool -printcert -file Bob.cer
+Proprietario: CN=Bob, OU=OASIS Interop Test Cert, O=OASIS
+Organismo di emissione: CN=OASIS Interop Test CA, O=OASIS
+Numero di serie: 6038eedbfeac9bbec89d87d3abae71f8
+Valido da Sat Mar 19 01:00:00 CET 2005 a Tue Mar 20 00:59:59 CET 2018
+Impronte digitali certificato:
+ MD5: 89:3E:86:D2:4F:9C:E7:39:B6:71:8A:EF:00:C5:89:DC
+ SHA1: 35:03:34:20:1B:EE:A6:50:2D:11:34:2F:93:EE:A0:9F:C0:B5:DF:01
+
+--------------------------------------------------------------------------------------
+> keytool -printcert -file John.cer
Proprietario: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
Organismo di emissione: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
Numero di serie: 4832ac71
@@ -32,17 +42,7 @@
MD5: C8:64:7A:4A:67:AC:73:A2:48:26:0A:B3:84:1D:0C:BB
SHA1: 0A:22:01:1C:11:E0:CC:33:D7:D1:97:D6:BF:0B:3B:77:A3:6C:93:70
---------------------------------------------------------------------------------------
-> keytool -printcert -file John.cer
-Proprietario: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
-Organismo di emissione: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
-Numero di serie: 47bac08f
-Valido da Tue Feb 19 12:42:07 CET 2008 a Mon May 19 13:42:07 CEST 2008
-Impronte digitali certificato:
- MD5: 33:59:21:4E:1C:2F:21:7E:46:9A:48:0D:56:E4:50:99
- SHA1: 68:46:92:0D:EF:65:BB:68:90:7C:5C:2D:0C:BD:60:F2:8E:62:1F:8B
-
--------------------------------------------------------------------------------------
keytool -list -keystore wsse10.truststore
Immettere la password del keystore: password
16 years, 8 months
JBossWS SVN: r7102 - in stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814: META-INF and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-20 07:00:20 -0400 (Tue, 20 May 2008)
New Revision: 7102
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/John.cer
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/META-INF/john-sign_enc.jks
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/META-INF/wsse10.truststore
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/WEB-INF/bob-sign_enc.jks
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/WEB-INF/wsse10.truststore
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt
Log:
Fixing jbws1814 regression
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/John.cer
===================================================================
(Binary files differ)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/META-INF/john-sign_enc.jks
===================================================================
(Binary files differ)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/META-INF/wsse10.truststore
===================================================================
(Binary files differ)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/WEB-INF/bob-sign_enc.jks
===================================================================
(Binary files differ)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/WEB-INF/wsse10.truststore
===================================================================
(Binary files differ)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt 2008-05-20 10:50:58 UTC (rev 7101)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/readme.txt 2008-05-20 11:00:20 UTC (rev 7102)
@@ -24,15 +24,14 @@
--------------------------------------------------------------------------------------
> keytool -printcert -file Bob.cer
-Proprietario: CN=Bob, OU=OASIS Interop Test Cert, O=OASIS
-Organismo di emissione: CN=OASIS Interop Test CA, O=OASIS
-Numero di serie: 6038eedbfeac9bbec89d87d3abae71f8
-Valido da Sat Mar 19 01:00:00 CET 2005 a Tue Mar 20 00:59:59 CET 2018
+Proprietario: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
+Organismo di emissione: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
+Numero di serie: 4832ac71
+Valido da Tue May 20 12:48:17 CEST 2008 a Fri May 18 12:48:17 CEST 2018
Impronte digitali certificato:
- MD5: 89:3E:86:D2:4F:9C:E7:39:B6:71:8A:EF:00:C5:89:DC
- SHA1: 35:03:34:20:1B:EE:A6:50:2D:11:34:2F:93:EE:A0:9F:C0:B5:DF:01
+ MD5: C8:64:7A:4A:67:AC:73:A2:48:26:0A:B3:84:1D:0C:BB
+ SHA1: 0A:22:01:1C:11:E0:CC:33:D7:D1:97:D6:BF:0B:3B:77:A3:6C:93:70
-
--------------------------------------------------------------------------------------
> keytool -printcert -file John.cer
Proprietario: CN=John, OU=Test, O=Test, L=Test, ST=Test, C=IT
@@ -57,8 +56,8 @@
Impronta digitale certificato (MD5): 57:CE:81:F1:03:C4:2C:F7:5B:1A:DE:AC:43:64:0A:84
bob, 9-mar-2006, trustedCertEntry,
Impronta digitale certificato (MD5): 89:3E:86:D2:4F:9C:E7:39:B6:71:8A:EF:00:C5:89:DC
-john, 19-feb-2008, trustedCertEntry,
-Impronta digitale certificato (MD5): 33:59:21:4E:1C:2F:21:7E:46:9A:48:0D:56:E4:50:99
+john, 20-mag-2008, trustedCertEntry,
+Impronta digitale certificato (MD5): C8:64:7A:4A:67:AC:73:A2:48:26:0A:B3:84:1D:0C:BB
--------------------------------------------------------------------------------------
@@ -89,8 +88,8 @@
Impronta digitale certificato (MD5): 57:CE:81:F1:03:C4:2C:F7:5B:1A:DE:AC:43:64:0A:84
1, 27-ott-2007, keyEntry,
Impronta digitale certificato (MD5): 89:3E:86:D2:4F:9C:E7:39:B6:71:8A:EF:00:C5:89:DC
-john, 19-feb-2008, trustedCertEntry,
-Impronta digitale certificato (MD5): 33:59:21:4E:1C:2F:21:7E:46:9A:48:0D:56:E4:50:99
+john, 20-mag-2008, trustedCertEntry,
+Impronta digitale certificato (MD5): C8:64:7A:4A:67:AC:73:A2:48:26:0A:B3:84:1D:0C:BB
--------------------------------------------------------------------------------------
@@ -102,8 +101,8 @@
Il keystore contiene 2 entry
-1, 19-feb-2008, keyEntry,
-Impronta digitale certificato (MD5): 33:59:21:4E:1C:2F:21:7E:46:9A:48:0D:56:E4:50:99
-bob, 19-feb-2008, trustedCertEntry,
+1, 20-mag-2008, keyEntry,
+Impronta digitale certificato (MD5): C8:64:7A:4A:67:AC:73:A2:48:26:0A:B3:84:1D:0C:BB
+bob, 20-mag-2008, trustedCertEntry,
Impronta digitale certificato (MD5): 89:3E:86:D2:4F:9C:E7:39:B6:71:8A:EF:00:C5:89:DC
16 years, 8 months