4:45 p.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-03-18 11:45:18 -0400 (Mon, 18 Mar 2013)
New Revision: 17392
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml
Removed:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml
Log:
Backporting commit 17304 (Fixing testcase as a consequence of AS7-6476 changes
(missing-method-permission-deny-access default true)
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-03-18
15:31:00 UTC (rev 17391)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -731,6 +731,19 @@
<include name="jboss-webservices.xml" />
</metainf>
</jar>
+ <jar
jarfile="${tests.output.dir}/test-libs/jaxws-jbws2241-as71.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3Bean.class" />
+ <include
name="org/jboss/test/ws/jaxws/jbws2241/EJB3RemoteInterface.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointInterface.class"
/>
+ <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointService.class"
/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF-as71">
+ <include name="jboss.xml" />
+ <include name="jboss-ejb3.xml" />
+ <include name="jboss-webservices.xml" />
+ </metainf>
+ </jar>
<!-- jaxws-jbws2250 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml">
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2013-03-18
15:31:00 UTC (rev 17391)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2013-03-18
15:45:18 UTC (rev 17392)
@@ -41,29 +41,45 @@
*/
public class JBWS2241TestCase extends JBossWSTest
{
- private EndpointInterface port;
-
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar",
true);
+ return new JBossWSTestSetup(JBWS2241TestCase.class, isTargetJBoss71() ?
"jaxws-jbws2241-as71.jar" : "jaxws-jbws2241.jar", true);
}
- public void setUp() throws MalformedURLException
- {
- if (port == null)
- {
- URL wsdlURL = new URL("http://" + getServerHost() +
":8080/contextRoot/urlPattern/test?wsdl");
- QName serviceName = new
QName("http://jbws2241.jaxws.ws.test.jboss.org/";, "EJB3BeanService");
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(EndpointInterface.class);
-
((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
"kermit");
-
((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY,
"thefrog");
+ private EndpointInterface getPort(String user, String pwd) throws
MalformedURLException {
+ URL wsdlURL = new URL("http://" + getServerHost() +
":8080/contextRoot/urlPattern/test?wsdl");
+ QName serviceName = new QName("http://jbws2241.jaxws.ws.test.jboss.org/";,
"EJB3BeanService");
+ Service service = Service.create(wsdlURL, serviceName);
+ EndpointInterface port = service.getPort(EndpointInterface.class);
+ if (user != null) {
+
((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, user);
}
+ if (pwd != null) {
+
((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, pwd);
+ }
+ return port;
}
public void testInvocation() throws Exception
{
+ EndpointInterface port = getPort("kermit", "thefrog");
String hello = port.hello("hello");
assertEquals("hello", hello);
+
+ port = getPort("kermit", "notthefrog");
+ try {
+ port.hello("hi");
+ fail("Failure expected with wrong credentials");
+ } catch (Exception e) {
+
+ }
+
+ port = getPort(null, null);
+ try {
+ port.hello("hi");
+ fail("Failure expected without credentials");
+ } catch (Exception e) {
+
+ }
}
}
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml 2013-03-18
15:31:00 UTC (rev 17391)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-ejb3.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -10,9 +10,10 @@
impl-version="2.0">
<spec:assembly-descriptor>
- <security xmlns="urn:security">
+ <security xmlns="urn:security:1.1">
<spec:ejb-name>EJB3Bean</spec:ejb-name>
<security-domain>JBossWS</security-domain>
+
<missing-method-permissions-deny-access>false</missing-method-permissions-deny-access>
</security>
<spec:security-role>
<spec:role-name>friend</spec:role-name>
Deleted:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml 2013-02-13
09:43:02 UTC (rev 17304)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<jboss:jboss
- xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
- xmlns:spec="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_5_0.xsd
- http://java.sun.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd"
- version="3.1"
- impl-version="2.0">
-
- <spec:assembly-descriptor>
- <security xmlns="urn:security">
- <spec:ejb-name>EJB3Bean</spec:ejb-name>
- <security-domain>JBossWS</security-domain>
- </security>
- <spec:security-role>
- <spec:role-name>friend</spec:role-name>
- </spec:security-role>
- </spec:assembly-descriptor>
-
-</jboss:jboss>
Copied:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml
(from rev 17304,
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml)
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml
(rev 0)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-ejb3.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss:jboss
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:spec="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_5_0.xsd
+ http://java.sun.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd"
+ version="3.1"
+ impl-version="2.0">
+
+ <spec:assembly-descriptor>
+ <security xmlns="urn:security">
+ <spec:ejb-name>EJB3Bean</spec:ejb-name>
+ <security-domain>JBossWS</security-domain>
+ </security>
+ <spec:security-role>
+ <spec:role-name>friend</spec:role-name>
+ </spec:security-role>
+ </spec:assembly-descriptor>
+
+</jboss:jboss>
Deleted:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml 2013-02-13
09:43:02 UTC (rev 17304)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -1,20 +0,0 @@
-<?xml version="1.1" encoding="UTF-8"?>
-<webservices
- xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.0"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd">
-
- <context-root>/contextRoot</context-root>
-
- <port-component>
- <ejb-name>EJB3Bean</ejb-name>
- <port-component-name>TestPortComponent</port-component-name>
- <port-component-uri>/urlPattern/test</port-component-uri>
- <auth-method>BASIC</auth-method>
- <transport-guarantee>NONE</transport-guarantee>
- <secure-wsdl-access>false</secure-wsdl-access>
- </port-component>
-
-</webservices>
-
Copied:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml
(from rev 17304,
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml)
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml
(rev 0)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss-webservices.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<webservices
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.0"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+ <context-root>/contextRoot</context-root>
+
+ <port-component>
+ <ejb-name>EJB3Bean</ejb-name>
+ <port-component-name>TestPortComponent</port-component-name>
+ <port-component-uri>/urlPattern/test</port-component-uri>
+ <auth-method>BASIC</auth-method>
+ <transport-guarantee>NONE</transport-guarantee>
+ <secure-wsdl-access>false</secure-wsdl-access>
+ </port-component>
+
+</webservices>
+
Deleted:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml 2013-02-13
09:43:02 UTC (rev 17304)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
-
-<jboss>
-
- <security-domain>JBossWS</security-domain>
-
- <enterprise-beans>
- <session>
- <ejb-name>EJB3Bean</ejb-name>
- <jndi-name>ejb/EJB3Bean</jndi-name>
- </session>
- </enterprise-beans>
-
-</jboss>
Copied:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml
(from rev 17304,
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml)
===================================================================
---
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml
(rev 0)
+++
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/resources/jaxws/jbws2241/META-INF-as71/jboss.xml 2013-03-18
15:45:18 UTC (rev 17392)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
+
+<jboss>
+
+ <security-domain>JBossWS</security-domain>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>EJB3Bean</ejb-name>
+ <jndi-name>ejb/EJB3Bean</jndi-name>
+ </session>
+ </enterprise-beans>
+
+</jboss>