JBossWS SVN: r7379 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-05 03:29:19 -0400 (Thu, 05 Jun 2008)
New Revision: 7379
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
[JBWS-2174] Excluding securityDomain samples on AS 5 Beta 4
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:29:33 UTC (rev 7378)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-05 07:29:19 UTC (rev 7379)
@@ -119,6 +119,7 @@
org/jboss/test/ws/jaxws/jbws1799/**
org/jboss/test/ws/jaxws/jbws1872/**
org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/samples/securityDomain/**
org/jboss/test/ws/jaxws/samples/swaref/**
org/jboss/test/ws/jaxws/samples/eardeployment/**
org/jboss/test/ws/jaxws/samples/advanced/retail/**
16 years, 7 months
JBossWS SVN: r7378 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-04 12:29:33 -0400 (Wed, 04 Jun 2008)
New Revision: 7378
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:24:54 UTC (rev 7377)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:29:33 UTC (rev 7378)
@@ -8,6 +8,9 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:24:54 UTC (rev 7377)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:29:33 UTC (rev 7378)
@@ -8,6 +8,9 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:24:54 UTC (rev 7377)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:29:33 UTC (rev 7378)
@@ -5,6 +5,9 @@
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
@@ -39,10 +42,6 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/jbws1840/**
-
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:24:54 UTC (rev 7377)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:29:33 UTC (rev 7378)
@@ -5,6 +5,9 @@
# Won't Fix: [CXF-1261] Handler does not see XOP message properly
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
@@ -46,9 +49,6 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/jbws1840/**
-
# [CXF-1510] Cannot handle anonymous bare requests
org/jboss/test/ws/jaxws/anonymous/**
16 years, 7 months
JBossWS SVN: r7377 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-04 12:24:54 -0400 (Wed, 04 Jun 2008)
New Revision: 7377
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:06:06 UTC (rev 7376)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:24:54 UTC (rev 7377)
@@ -2,6 +2,9 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:06:06 UTC (rev 7376)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:24:54 UTC (rev 7377)
@@ -2,6 +2,9 @@
# $Id$
#
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+
# [JBWS-1178] Multiple virtual host and soap:address problem
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:06:06 UTC (rev 7376)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:24:54 UTC (rev 7377)
@@ -2,6 +2,9 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -11,10 +14,6 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/jbws1840/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:06:06 UTC (rev 7376)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:24:54 UTC (rev 7377)
@@ -2,6 +2,9 @@
# $Id$
#
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
@@ -18,10 +21,6 @@
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/jbws1840/**
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
16 years, 7 months
JBossWS SVN: r7376 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-04 12:06:06 -0400 (Wed, 04 Jun 2008)
New Revision: 7376
Added:
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/META-INF/jboss.xml
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/jaxws/jbws1988/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.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/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
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:
[JBWS-2107] Resolve dependency on @SecurityDomain
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 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2008-06-04 16:06:06 UTC (rev 7376)
@@ -30,6 +30,9 @@
<include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
<include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
</fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+ <include name="jboss.xml"/>
+ </metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -53,6 +56,9 @@
<include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
<include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
</fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
+ <include name="jboss.xml"/>
+ </metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -175,6 +181,27 @@
<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/jaxws/jbws1988/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWSDigest")
@RolesAllowed({"friend"})
public class HelloJavaBean
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@WebContext(contextRoot = "/jaxws-jbws1991", urlPattern = "/*")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
@RolesAllowed({"friend"})
public class HelloJavaBean
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -39,8 +39,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@WebContext(contextRoot = "/jaxws-jbws2116", urlPattern = "/*")
@EndpointConfig(configName = "Standard WSSecurity Endpoint")
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
public class HelloJavaBean
{
private Logger log = Logger.getLogger(HelloJavaBean.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -60,8 +60,6 @@
serviceName = "DarService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/dar",
urlPattern="/*",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -42,8 +42,6 @@
serviceName = "DarService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
@WebContext(contextRoot="/dar",
urlPattern="/*",
authMethod="BASIC",
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 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
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;
/**
@@ -40,10 +41,11 @@
{
public static Test suite()
{
+ String newspaperJar = new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
- "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar"
+ newspaperJar + ", jaxws-samples-news-step2-agency-client.jar"
);
}
Added: 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 (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,50 @@
+/*
+ * 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.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.WebContext;
+
+
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperMTOM",
+ name = "NewspaperMTOMEndpoint",
+ targetNamespace = "http://org.jboss.ws/samples/news",
+ serviceName = "NewspaperMTOMService")
+@SOAPBinding(style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL)
+@SecurityDomain("JBossWS")
+@WebContext(contextRoot="/news",
+ urlPattern="/newspaper/mtom",
+ authMethod="BASIC",
+ transportGuarantee="CONFIDENTIAL",
+ secureWSDLAccess=false)
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+public class SecureNewspaperMTOMAS5Endpoint extends AbstractNewspaperMTOMEndpoint implements NewspaperMTOM
+{
+
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.BindingType;
+import org.jboss.annotation.security.SecurityDomain;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -36,8 +37,7 @@
serviceName = "NewspaperMTOMService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
+@SecurityDomain("JBossWS")
@WebContext(contextRoot="/news",
urlPattern="/newspaper/mtom",
authMethod="BASIC",
Added: 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 (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,48 @@
+/*
+ * 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.news;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.ejb3.annotation.SecurityDomain;
+
+
+@Stateless
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperSWA",
+ name = "NewspaperSWAEndpoint",
+ targetNamespace = "http://org.jboss.ws/samples/news",
+ serviceName = "NewspaperSWAService")
+@SOAPBinding(style = SOAPBinding.Style.RPC,
+ use = SOAPBinding.Use.LITERAL)
+@SecurityDomain("JBossWS")
+@WebContext(contextRoot="/news",
+ urlPattern="/newspaper/swa",
+ authMethod="BASIC",
+ transportGuarantee="CONFIDENTIAL",
+ secureWSDLAccess=false)
+public class SecureNewspaperSWAAS5Endpoint extends AbstractNewspaperSWAEndpoint implements NewspaperSWA
+{
+
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
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 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -26,6 +26,7 @@
import javax.jws.soap.SOAPBinding;
import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.annotation.security.SecurityDomain;
@Stateless
@@ -35,8 +36,7 @@
serviceName = "NewspaperSWAService")
@SOAPBinding(style = SOAPBinding.Style.RPC,
use = SOAPBinding.Use.LITERAL)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
+@SecurityDomain("JBossWS")
@WebContext(contextRoot="/news",
urlPattern="/newspaper/swa",
authMethod="BASIC",
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-06-04 16:06:06 UTC (rev 7376)
@@ -28,6 +28,7 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -36,8 +37,7 @@
@SOAPBinding(style = Style.RPC)
@WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
-//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42
-//@SecurityDomain("JBossWS")
+@SecurityDomain("JBossWS")
@RolesAllowed("friend")
public class SecureEndpointImpl
{
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml 2008-06-04 16:06:06 UTC (rev 7376)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss>
+ <security-domain>java:/jaas/JBossWS</security-domain>
+</jboss>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,6 +10,11 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
+
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/jaxws/jbws1762/**
@@ -32,8 +37,3 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
-
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,6 +10,11 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# Exclude endpoint with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
+
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
# This requires changes to the AS web meta data (servlet init params)
org/jboss/test/ws/jaxws/jbws1762/**
@@ -27,9 +32,5 @@
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
-
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-04 16:06:06 UTC (rev 7376)
@@ -10,9 +10,10 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.*
-org/jboss/test/ws/jaxws/samples/dar/ClientTestCase.*
+# Exclude endpoints with AS5 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 16:06:06 UTC (rev 7376)
@@ -8,6 +8,11 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# 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.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -24,4 +29,4 @@
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
# [JBWS-2170] Fix embedded for maven build
-org/jboss/test/ws/embedded/**
\ No newline at end of file
+org/jboss/test/ws/embedded/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:04:01 UTC (rev 7375)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-04 16:06:06 UTC (rev 7376)
@@ -8,6 +8,11 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+# 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.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -23,12 +28,6 @@
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
-org/jboss/test/ws/jaxws/samples/dar/**
-org/jboss/test/ws/jaxws/samples/news/**
-org/jboss/test/ws/jaxws/jbws1840/**
-
# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
16 years, 7 months
JBossWS SVN: r7375 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-04 12:04:01 -0400 (Wed, 04 Jun 2008)
New Revision: 7375
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1840/
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
Log:
[JBWS-2107] New sample using @SecurityDomain according to the container
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-06-04 15:49:03 UTC (rev 7374)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-06-04 16:04:01 UTC (rev 7375)
@@ -419,13 +419,6 @@
<fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar"/>
</ear>
- <!-- jaxws-jbws1840 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1840.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/>
- </fileset>
- </jar>
-
<!-- jaxws-jbws1841 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-06-04 15:49:03 UTC (rev 7374)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-06-04 16:04:01 UTC (rev 7375)
@@ -203,6 +203,18 @@
<include name="wsdl/*"/>
</metainf>
</jar>
+
+ <!-- jaxws-samples-securityDomain -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain-as5.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-samples-serviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java 2008-06-04 16:04:01 UTC (rev 7375)
@@ -0,0 +1,40 @@
+/*
+ * 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.securityDomain;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/securityDomain")
+@SOAPBinding(style = Style.RPC)
+public interface SecureEndpoint
+{
+
+ @WebMethod
+ @WebResult(targetNamespace = "http://org.jboss.ws/securityDomain", partName = "return")
+ public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0);
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java 2008-06-04 16:04:01 UTC (rev 7375)
@@ -0,0 +1,53 @@
+/*
+ * 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.securityDomain;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/securityDomain")
+@Stateless(name = "SecureEndpoint")
+@SOAPBinding(style = Style.RPC)
+
+@WebContext(contextRoot="/jaxws-securityDomain", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
+@SecurityDomain("JBossWS")
+@RolesAllowed("friend")
+public class SecureEndpointAS5Impl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(SecureEndpointAS5Impl.class);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java 2008-06-04 16:04:01 UTC (rev 7375)
@@ -0,0 +1,53 @@
+/*
+ * 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.securityDomain;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/securityDomain")
+@Stateless(name = "SecureEndpoint")
+@SOAPBinding(style = Style.RPC)
+
+@WebContext(contextRoot="/jaxws-securityDomain", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
+@SecurityDomain("JBossWS")
+@RolesAllowed("friend")
+public class SecureEndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(SecureEndpointImpl.class);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2008-06-04 16:04:01 UTC (rev 7375)
@@ -0,0 +1,90 @@
+/*
+ * 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.securityDomain;
+
+//$Id$
+
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secure endpoint using
+ *
+ * @SecurityDomain
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-Jun-2008
+ */
+public class SecurityDomainTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-securityDomain";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SecurityDomainTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-securityDomain-as5.jar" : "jaxws-samples-securityDomain.jar");
+ }
+
+ private SecureEndpoint getPort() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/securityDomain", "SecureEndpointService");
+ SecureEndpoint port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class);
+ return port;
+ }
+
+ public void testNegative() throws Exception
+ {
+ SecureEndpoint port = getPort();
+ try
+ {
+ port.echo("Hello");
+ fail("Expected: Invalid HTTP server response [401] - Unauthorized");
+ }
+ catch (WebServiceException ex)
+ {
+ // all good
+ }
+ }
+
+ 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");
+
+ String retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
JBossWS SVN: r7374 - stack/metro/trunk/modules/management/src/main/webapp.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 11:49:03 -0400 (Wed, 04 Jun 2008)
New Revision: 7374
Modified:
stack/metro/trunk/modules/management/src/main/webapp/index.html
Log:
Use 'Version' instead of 'Revision'
Modified: stack/metro/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/metro/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:48:56 UTC (rev 7373)
+++ stack/metro/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:49:03 UTC (rev 7374)
@@ -18,7 +18,7 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><b>Revision: jbossws-metro-@version@</b></li>
+ <li><b>Version: jbossws-metro-@version@</b></li>
<li><b>Build: @buildNumber@</b></li>
<li><a href="services">View a list of deployed services</a></li>
<!--li><a href="depends">View installed dependencies</a></li-->
16 years, 7 months
JBossWS SVN: r7373 - stack/native/trunk/modules/management/src/main/webapp.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 11:48:56 -0400 (Wed, 04 Jun 2008)
New Revision: 7373
Modified:
stack/native/trunk/modules/management/src/main/webapp/index.html
Log:
Use 'Version' instead of 'Revision'
Modified: stack/native/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/native/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:40:24 UTC (rev 7372)
+++ stack/native/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:48:56 UTC (rev 7373)
@@ -18,7 +18,7 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><b>Revision: jbossws-native-@version@</b></li>
+ <li><b>Version: jbossws-native-@version@</b></li>
<li><b>Build: @buildNumber@</b></li>
<li><a href="services">View a list of deployed services</a></li>
<!--li><a href="depends">View installed dependencies</a></li-->
16 years, 7 months
JBossWS SVN: r7372 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 11:40:24 -0400 (Wed, 04 Jun 2008)
New Revision: 7372
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Fix get impl vendor for cxf
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-06-04 15:26:29 UTC (rev 7371)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-06-04 15:40:24 UTC (rev 7372)
@@ -113,7 +113,7 @@
public boolean isIntegrationCXF()
{
String vendor = getImplementationVendor();
- return vendor.toLowerCase().indexOf("cxf") != -1;
+ return vendor.toLowerCase().indexOf("apache") != -1;
}
private String getImplementationVendor()
16 years, 7 months
JBossWS SVN: r7371 - stack/native/trunk/modules/management/src/main/webapp.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-04 11:26:29 -0400 (Wed, 04 Jun 2008)
New Revision: 7371
Modified:
stack/native/trunk/modules/management/src/main/webapp/index.html
Log:
follow our convention
Modified: stack/native/trunk/modules/management/src/main/webapp/index.html
===================================================================
--- stack/native/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:19:35 UTC (rev 7370)
+++ stack/native/trunk/modules/management/src/main/webapp/index.html 2008-06-04 15:26:29 UTC (rev 7371)
@@ -18,7 +18,7 @@
<fieldset>
<legend><b>Runtime information</b></legend>
<ul>
- <li><b>Revision: jbossws-@version@-native</b></li>
+ <li><b>Revision: jbossws-native-@version@</b></li>
<li><b>Build: @buildNumber@</b></li>
<li><a href="services">View a list of deployed services</a></li>
<!--li><a href="depends">View installed dependencies</a></li-->
16 years, 7 months
JBossWS SVN: r7370 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 11:19:35 -0400 (Wed, 04 Jun 2008)
New Revision: 7370
Modified:
stack/cxf/trunk/pom.xml
Log:
Add log4j dependency
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-06-04 15:19:23 UTC (rev 7369)
+++ stack/cxf/trunk/pom.xml 2008-06-04 15:19:35 UTC (rev 7370)
@@ -273,14 +273,13 @@
<version>${jboss.common.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- transitve dependencies -->
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- <scope>provided</scope>
</dependency>
-
- <!-- transitve dependencies -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
16 years, 7 months