JBossWS SVN: r13690 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-08 09:40:14 -0500 (Tue, 08 Feb 2011)
New Revision: 13690
Modified:
common/trunk/pom.xml
Log:
fixing parent
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2011-02-08 14:34:50 UTC (rev 13689)
+++ common/trunk/pom.xml 2011-02-08 14:40:14 UTC (rev 13690)
@@ -15,7 +15,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.9.GA</version>
</parent>
<!-- Source Control Management -->
13 years, 7 months
JBossWS SVN: r13687 - spi/tags.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-08 09:28:52 -0500 (Tue, 08 Feb 2011)
New Revision: 13687
Added:
spi/tags/jbossws-spi-2.0.0.Alpha2/
Log:
Tagging SPI 2.0.0.Alpha2
Copied: spi/tags/jbossws-spi-2.0.0.Alpha2 (from rev 13686, spi/trunk)
13 years, 7 months
JBossWS SVN: r13685 - in thirdparty/cxf/branches/cxf-2.2.12: api and 69 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-08 09:04:54 -0500 (Tue, 08 Feb 2011)
New Revision: 13685
Modified:
thirdparty/cxf/branches/cxf-2.2.12/
thirdparty/cxf/branches/cxf-2.2.12/api/
thirdparty/cxf/branches/cxf-2.2.12/buildtools/
thirdparty/cxf/branches/cxf-2.2.12/common/common/
thirdparty/cxf/branches/cxf-2.2.12/common/schemas/
thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/
thirdparty/cxf/branches/cxf-2.2.12/common/xsd/
thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/
thirdparty/cxf/branches/cxf-2.2.12/integration/jca/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/
thirdparty/cxf/branches/cxf-2.2.12/parent/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/
thirdparty/cxf/branches/cxf-2.2.12/rt/core/
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/
thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/
thirdparty/cxf/branches/cxf-2.2.12/rt/management/
thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/
thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/
thirdparty/cxf/branches/cxf-2.2.12/systests/transports/
thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/
thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/
thirdparty/cxf/branches/cxf-2.2.12/testutils/
thirdparty/cxf/branches/cxf-2.2.12/tools/common/
thirdparty/cxf/branches/cxf-2.2.12/tools/corba/
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/
thirdparty/cxf/branches/cxf-2.2.12/tools/validator/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/
Log:
[JBPAPP-5889] Setting svn:ignore
Property changes on: thirdparty/cxf/branches/cxf-2.2.12
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/api
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/buildtools
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/common
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/schemas
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/common/xsd
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/integration/jbi
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/integration/jca
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/parent
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/core
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/javascript
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/management
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/databinding
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/transports
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/testutils
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/common
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/corba
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/validator
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
Property changes on: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
13 years, 7 months
JBossWS SVN: r13683 - stack/cxf/branches/JBPAPP-5764.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-07 13:44:05 -0500 (Mon, 07 Feb 2011)
New Revision: 13683
Modified:
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Moving to Apache CXF 2.2.12
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-07 17:22:45 UTC (rev 13682)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-07 18:44:05 UTC (rev 13683)
@@ -52,7 +52,7 @@
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <cxf.version>2.2.9</cxf.version>
+ <cxf.version>2.2.12</cxf.version>
<cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
13 years, 7 months
JBossWS SVN: r13682 - in stack/cxf/branches/JBPAPP-5764: modules/testsuite/cxf-tests and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-07 12:22:45 -0500 (Mon, 07 Feb 2011)
New Revision: 13682
Removed:
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/
Modified:
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Removing testcase using PicketBox API for loading security config from a custom file; that's doable differently in any case, see wsseDigest testcase for instance
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml 2011-02-07 14:09:52 UTC (rev 13681)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml 2011-02-07 17:22:45 UTC (rev 13682)
@@ -20,11 +20,6 @@
<artifactId>jbossws-cxf-server</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>picketbox-bare</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Profiles -->
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-02-07 14:09:52 UTC (rev 13681)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-02-07 17:22:45 UTC (rev 13682)
@@ -143,25 +143,6 @@
</webinf>
</war>
- <!-- jaxws-samples-wsse-username-authorize-custom -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize-custom.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="login-config.xml"/>
- <include name="users.properties"/>
- <include name="roles.properties"/>
- <include name="jbossws-cxf.xml"/>
- <include name="wsdl/*"/>
- </webinf>
- </war>
-
<!-- jaxws-samples-wsse-username-digest -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.war"
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-02-07 14:09:52 UTC (rev 13681)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-02-07 17:22:45 UTC (rev 13682)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse;
-
-import java.util.Collections;
-import org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor;
-import org.picketbox.config.PicketBoxConfiguration;
-import org.picketbox.exceptions.ConfigurationStreamNullException;
-import org.picketbox.factories.SecurityFactory;
-
-
-/**
- * Interceptor which authenticates a current principal and populates Subject
- *
- * @author Sergey Beryozkin
- *
- */
-public class CustomSubjectCreatingInterceptor extends SubjectCreatingInterceptor
-{
-
- public CustomSubjectCreatingInterceptor()
- {
- super(Collections.<String, Object> singletonMap("action", "UsernameToken"));
- }
-
- public void setSecurityConfigFile(String configFilePath)
- {
- SecurityFactory.prepare();
- try
- {
- PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration();
- idtrustConfig.load(configFilePath);
- }
- catch (ConfigurationStreamNullException ex) {
- throw new SecurityException("Unable to load the configuration file " + configFilePath);
- }
- catch (Exception ex) {
- throw new SecurityException("Unable to read the configuration file " + configFilePath, ex);
- }
- finally
- {
- SecurityFactory.release();
- }
- }
-
-
-}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2011-02-07 17:22:45 UTC (rev 13682)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * WS-Security username authorization test case
- *
- * @author Sergey Beryozkin
- *
- */
-public final class UsernameAuthorizationCustomFileTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize-custom";
- private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
-
- public static Test suite()
- {
- return new JBossWSTestSetup(UsernameAuthorizationCustomFileTestCase.class, "jaxws-samples-wsse-username-authorize-custom.war");
- }
-
- public void testAuthorizedCustomConfig() throws Exception
- {
- doTestAuthorized(serviceURL, servicePort, "theKermit");
- }
-
-private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
- setupWsse(proxy, userName);
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
-
- public void testUnauthenticated() throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "foo");
- try
- {
- proxy.sayHello();
- fail("User foo should not be authenticated.");
- }
- catch (Exception ex)
- {
- //expected
- }
- }
-
- public void testUnauthorizedCustomConfig() throws Exception
- {
- doTestUnauthorized(serviceURL, servicePort, "theKermit");
- }
-
-private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
- setupWsse(proxy, userName);
- try
- {
- proxy.greetMe();
- fail("User kermit should not be authorized to invoke greetMe.");
- }
- catch (Exception ex)
- {
- assertEquals("Unauthorized", ex.getMessage());
- }
- }
-
- private void setupWsse(ServiceIface proxy, String username)
- {
- Client client = ClientProxy.getClient(proxy);
- Endpoint cxfEndpoint = client.getEndpoint();
-
- Map<String, Object> outProps = new HashMap<String, Object>();
- outProps.put("action", "UsernameToken");
- outProps.put("user", username);
- outProps.put("passwordType", "PasswordText");
- outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.UsernamePasswordCallback");
- WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
- cxfEndpoint.getOutInterceptors().add(wssOut);
- cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
- }
-}
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-07 14:09:52 UTC (rev 13681)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-07 17:22:45 UTC (rev 13682)
@@ -61,7 +61,6 @@
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
- <picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
@@ -486,22 +485,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>picketbox-bare</artifactId>
- <version>${picketbox.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<version>${jboss.security.spi.version}</version>
13 years, 7 months
JBossWS SVN: r13681 - in stack/cxf/branches/JBPAPP-5764: modules/server and 23 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-07 09:09:52 -0500 (Mon, 07 Feb 2011)
New Revision: 13681
Added:
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml
Removed:
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml
Modified:
stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Porting most of the changes for JBWS-3028 (Complete JBWS-CXF Username Token JAAS integration), commit rev. 12404, 12420, 12449, 12454, 12495, 12510, 12512, 12514
Modified: stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/pom.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -164,6 +164,14 @@
<groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Modified: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -45,7 +45,8 @@
}
catch (NamingException ne)
{
- throw new SecurityException("Unable to lookup AuthenticationManager");
+ throw new SecurityException("Unable to lookup AuthenticationManager using JNDI");
}
}
+
}
Modified: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -21,20 +21,31 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
+import java.io.IOException;
import java.security.Principal;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Map;
import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.handler.RequestData;
import org.jboss.logging.Logger;
import org.jboss.security.AuthenticationManager;
+import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallbackHandler;
+import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
+import org.jboss.xb.binding.SimpleTypeBindings;
/**
* Interceptor which authenticates a current principal and populates Subject
@@ -45,8 +56,17 @@
public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
{
private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
+ private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
+
+ private AuthenticationManagerLoader aml;
+ private boolean propagateContext;
private SecurityAdaptorFactory secAdaptorFactory;
+ private int timestampThreshold = TIMESTAMP_FRESHNESS_THRESHOLD;
+ private NonceStore nonceStore;
+ private boolean decodeNonce = true;
+ private boolean supportDigestPasswords;
+
public SubjectCreatingInterceptor()
{
this(Collections.<String, Object> emptyMap());
@@ -55,17 +75,6 @@
public SubjectCreatingInterceptor(Map<String, Object> properties)
{
super(properties);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- secAdaptorFactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
- }
-
- @Override
- public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
- {
- // Load AuthenticationManager
- // TODO : use PicketBox API
-
- AuthenticationManagerLoader aml = null;
try
{
aml = AuthenticationManagerLoader.class.newInstance();
@@ -76,19 +85,58 @@
log.error(msg);
throw new SecurityException(msg);
}
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ secAdaptorFactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
+ }
+
+ // TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
+ // has a bug to do with handling digests; RequestData assumes PasswordDigest by default
+ @Override
+ public void setSupportDigestPasswords(boolean support) {
+ this.supportDigestPasswords = support;
+ super.setSupportDigestPasswords(support);
+ }
+
+ // TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
+ // has a bug to do with handling digests; RequestData assumes PasswordDigest by default
+ @Override
+ protected CallbackHandler getCallback(RequestData reqData, int doAction)
+ throws WSSecurityException {
+
+ if (supportDigestPasswords) {
+ return new CallbackHandler()
+ {
+ @Override
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ // dummy handler
+ }
+ };
+ } else {
+ return super.getCallback(reqData, doAction);
+ }
+ }
+
+ @Override
+ public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
+ {
+ if (isDigest)
+ {
+ verifyUsernameToken(nonce, created);
+ // It is not possible at the moment to figure out if the digest has been created
+ // using the original nonce bytes or the bytes of the (Base64)-encoded nonce, some
+ // legacy clients might use the (Base64)-encoded nonce bytes when creating a digest;
+ // lets default to true and assume the nonce has been Base-64 encoded, given that
+ // WSS4J client Base64-decodes the nonce before creating the digest
+
+ CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce);
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
+ }
+
+ // authenticate and populate Subject
AuthenticationManager am = aml.getManager();
-
- // verify timestamp and nonce if digest
- if (isDigest)
- {
- //verifyUsernameToken(nonce, created);
- // CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created);
- // CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb);
- }
-
- // authenticate and populate Subject
-
+
Principal principal = new SimplePrincipal(name);
Subject subject = new Subject();
@@ -96,45 +144,71 @@
if (TRACE)
log.trace("About to authenticate, using security domain '" + am.getSecurityDomain() + "'");
- if (am.isValid(principal, password, subject) == false)
+ try
{
- String msg = "Authentication failed, principal=" + principal.getName();
- log.error(msg);
- throw new SecurityException(msg);
+ if (am.isValid(principal, password, subject) == false)
+ {
+ String msg = "Authentication failed, principal=" + principal.getName();
+ log.error(msg);
+ throw new SecurityException(msg);
+ }
+ }
+ finally
+ {
+ if (isDigest)
+ {
+ // does not remove the TL entry completely but limits the potential
+ // growth to a number of available threads in a container
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
+ }
}
-
- // push subject on the thread local storage
- SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
- adaptor.setPrincipal(principal);
- adaptor.setCredential(password);
- adaptor.pushSubjectContext(subject, principal, password);
-
+
if (TRACE)
log.trace("Authenticated, principal=" + name);
+ if (propagateContext)
+ {
+ SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
+ adaptor.pushSubjectContext(subject, principal, password);
+ if (TRACE)
+ log.trace("Security Context has been propagated");
+ }
return subject;
}
- /** TODO: JBWS-3028
- private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
- private NonceStore nonceStore;
-
private void verifyUsernameToken(String nonce, String created)
{
if (created != null)
{
Calendar cal = SimpleTypeBindings.unmarshalDateTime(created);
Calendar ref = Calendar.getInstance();
- ref.add(Calendar.SECOND, -TIMESTAMP_FRESHNESS_THRESHOLD);
+ ref.add(Calendar.SECOND, -timestampThreshold);
if (ref.after(cal))
throw new SecurityException("Request rejected since a stale timestamp has been provided: " + created);
}
- if (nonce != null)
+ if (nonce != null && nonceStore != null)
{
if (nonceStore.hasNonce(nonce))
throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
+ nonceStore.putNonce(nonce);
}
}
- */
+
+ public void setPropagateContext(boolean propagateContext) {
+ this.propagateContext = propagateContext;
+ }
+
+ public void setTimestampThreshold(int timestampThreshold) {
+ this.timestampThreshold = timestampThreshold;
+ }
+
+ public void setNonceStore(NonceStore nonceStore) {
+ this.nonceStore = nonceStore;
+ }
+
+ public void setDecodeNonce(boolean decodeNonce) {
+ this.decodeNonce = decodeNonce;
+ }
+
}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback (from rev 12495, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.security.authentication.callback;
-
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-
-import org.jboss.crypto.digest.DigestCallback;
-import org.jboss.security.auth.callback.MapCallback;
-
-/**
- * An implementation of DigestCallback that generates password
- * digests according to the UsernameTokenProfile 1.0 specification.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 12-Mar-2008
- *
- */
-public class UsernameTokenCallback implements DigestCallback
-{
- static final String NONCE = "nonce";
- static final String CREATED = "created";
- static final String DECODE_NONCE = "decodeNonce";
-
- private MapCallback info;
-
- @SuppressWarnings("unchecked")
- public void init(Map options)
- {
- // Ask for MapCallback to obtain the digest parameters
- info = new MapCallback();
- Callback[] callbacks = { info };
- options.put("callbacks", callbacks);
- }
-
- public void preDigest(MessageDigest digest)
- {
- try
- {
- String nonce = (String)info.getInfo(NONCE);
- if (nonce != null)
- {
- Boolean decodeNonce = (Boolean)info.getInfo(DECODE_NONCE);
- byte[] nonceBytes = decodeNonce ? org.jboss.util.Base64.decode(nonce)
- : nonce.getBytes("UTF-8");
- digest.update(nonceBytes);
- }
- String created = (String)info.getInfo(CREATED);
- if (created != null)
- digest.update(created.getBytes("UTF-8"));
- }
- catch (UnsupportedEncodingException e)
- {
- throw new SecurityException(e);
- }
- }
-
- public void postDigest(MessageDigest digest)
- {
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java (from rev 12495, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.security.authentication.callback;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+
+import org.jboss.crypto.digest.DigestCallback;
+import org.jboss.security.auth.callback.MapCallback;
+
+/**
+ * An implementation of DigestCallback that generates password
+ * digests according to the UsernameTokenProfile 1.0 specification.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2008
+ *
+ */
+public class UsernameTokenCallback implements DigestCallback
+{
+ static final String NONCE = "nonce";
+ static final String CREATED = "created";
+ static final String DECODE_NONCE = "decodeNonce";
+
+ private MapCallback info;
+
+ @SuppressWarnings("unchecked")
+ public void init(Map options)
+ {
+ // Ask for MapCallback to obtain the digest parameters
+ info = new MapCallback();
+ Callback[] callbacks = { info };
+ options.put("callbacks", callbacks);
+ }
+
+ public void preDigest(MessageDigest digest)
+ {
+ try
+ {
+ String nonce = (String)info.getInfo(NONCE);
+ if (nonce != null)
+ {
+ Boolean decodeNonce = (Boolean)info.getInfo(DECODE_NONCE);
+ byte[] nonceBytes = decodeNonce ? org.jboss.util.Base64.decode(nonce)
+ : nonce.getBytes("UTF-8");
+ digest.update(nonceBytes);
+ }
+ String created = (String)info.getInfo(CREATED);
+ if (created != null)
+ digest.update(created.getBytes("UTF-8"));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new SecurityException(e);
+ }
+ }
+
+ public void postDigest(MessageDigest digest)
+ {
+ }
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.security.authentication.callback;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.jboss.security.auth.callback.MapCallback;
-
-/**
- * A callback handler to be used to pass parameters to the
- * UsernameTokenCallback.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 12-Mar-2008
- *
- */
-public class UsernameTokenCallbackHandler implements CallbackHandler
-{
- private String nonce;
- private String created;
- private boolean decodeNonce;
-
- public UsernameTokenCallbackHandler(String nonce, String created, boolean decodeNonce)
- {
- this.created = created;
- this.nonce = nonce;
- this.decodeNonce = decodeNonce;
- }
-
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- boolean foundCallback = false;
- Callback firstUnknown = null;
- int count = callbacks != null ? callbacks.length : 0;
- for(int n = 0; n < count; n ++)
- {
- Callback c = callbacks[n];
- if( c instanceof MapCallback )
- {
- //set parameters to the MapCallback the UsernameTokenCallback
- //created and set up in the init method
- MapCallback mc = (MapCallback) c;
- mc.setInfo(UsernameTokenCallback.NONCE, nonce);
- mc.setInfo(UsernameTokenCallback.CREATED, created);
- mc.setInfo(UsernameTokenCallback.DECODE_NONCE, Boolean.valueOf(decodeNonce));
- foundCallback = true;
- }
- else if( firstUnknown == null )
- {
- firstUnknown = c;
- }
- }
- if( foundCallback == false )
- throw new UnsupportedCallbackException(firstUnknown, "Unrecognized Callback");
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java (from rev 12495, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.security.authentication.callback;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.jboss.security.auth.callback.MapCallback;
+
+/**
+ * A callback handler to be used to pass parameters to the
+ * UsernameTokenCallback.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2008
+ *
+ */
+public class UsernameTokenCallbackHandler implements CallbackHandler
+{
+ private String nonce;
+ private String created;
+ private boolean decodeNonce;
+
+ public UsernameTokenCallbackHandler(String nonce, String created, boolean decodeNonce)
+ {
+ this.created = created;
+ this.nonce = nonce;
+ this.decodeNonce = decodeNonce;
+ }
+
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ boolean foundCallback = false;
+ Callback firstUnknown = null;
+ int count = callbacks != null ? callbacks.length : 0;
+ for(int n = 0; n < count; n ++)
+ {
+ Callback c = callbacks[n];
+ if( c instanceof MapCallback )
+ {
+ //set parameters to the MapCallback the UsernameTokenCallback
+ //created and set up in the init method
+ MapCallback mc = (MapCallback) c;
+ mc.setInfo(UsernameTokenCallback.NONCE, nonce);
+ mc.setInfo(UsernameTokenCallback.CREATED, created);
+ mc.setInfo(UsernameTokenCallback.DECODE_NONCE, Boolean.valueOf(decodeNonce));
+ foundCallback = true;
+ }
+ else if( firstUnknown == null )
+ {
+ firstUnknown = c;
+ }
+ }
+ if( foundCallback == false )
+ throw new UnsupportedCallbackException(firstUnknown, "Unrecognized Callback");
+ }
+
+}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce (from rev 12495, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.security.nonce;
-
-/**
- * A nonce store collects recently used nonces.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 12-Mar-2008
- *
- */
-public interface NonceStore
-{
- /**
- * Checks whether the store contains the provided nonce.
- *
- * @param nonce
- * @return True if the provided nonce has been recently put in the store
- */
- public boolean hasNonce(String nonce);
-
- /**
- * Put the given nonce in the store.
- *
- * @param nonce
- */
- public void putNonce(String nonce);
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java (from rev 12495, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.security.nonce;
+
+/**
+ * A nonce store collects recently used nonces.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 12-Mar-2008
+ *
+ */
+public interface NonceStore
+{
+ /**
+ * Checks whether the store contains the provided nonce.
+ *
+ * @param nonce
+ * @return True if the provided nonce has been recently put in the store
+ */
+ public boolean hasNonce(String nonce);
+
+ /**
+ * Put the given nonce in the store.
+ *
+ * @param nonce
+ */
+ public void putNonce(String nonce);
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/pom.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -14,7 +14,19 @@
<relativePath>../pom.xml</relativePath>
</parent>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-bare</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<!-- Profiles -->
<profiles>
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -135,8 +135,6 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/SubjectCreatingInterceptor.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsse/AuthenticationManagerLoader.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF">
<include name="jboss-web.xml"/>
@@ -144,7 +142,75 @@
<include name="wsdl/*"/>
</webinf>
</war>
+
+ <!-- jaxws-samples-wsse-username-authorize-custom -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize-custom.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="login-config.xml"/>
+ <include name="users.properties"/>
+ <include name="roles.properties"/>
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+ <!-- jaxws-samples-wsse-username-digest -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsseDigest/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ <!-- if these files deployed in war then it works ok on AS 6.0 but not on 5.1
+ <include name="jboss-service.xml"/>
+ <include name="login-config.xml"/>
+ <include name="jbossws-users.properties"/>
+ <include name="jbossws-roles.properties"/>
+ -->
+
+ </webinf>
+ </war>
+
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest.sar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF">
+ <include name="jboss-service.xml"/>
+ <include name="login-config.xml"/>
+ <include name="jbossws-users.properties"/>
+ <include name="jbossws-roles.properties"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-wsseEJB -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.class"/>
+ </fileset>
+
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsseEJB/META-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="jboss.xml"/>
+ </metainf>
+
+ </jar>
+
<!-- jaxws-samples-wssePolicy-sign -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wssePolicy-sign.war"
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.util.Collections;
+import org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor;
+import org.picketbox.config.PicketBoxConfiguration;
+import org.picketbox.exceptions.ConfigurationStreamNullException;
+import org.picketbox.factories.SecurityFactory;
+
+
+/**
+ * Interceptor which authenticates a current principal and populates Subject
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public class CustomSubjectCreatingInterceptor extends SubjectCreatingInterceptor
+{
+
+ public CustomSubjectCreatingInterceptor()
+ {
+ super(Collections.<String, Object> singletonMap("action", "UsernameToken"));
+ }
+
+ public void setSecurityConfigFile(String configFilePath)
+ {
+ SecurityFactory.prepare();
+ try
+ {
+ PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration();
+ idtrustConfig.load(configFilePath);
+ }
+ catch (ConfigurationStreamNullException ex) {
+ throw new SecurityException("Unable to load the configuration file " + configFilePath);
+ }
+ catch (Exception ex) {
+ throw new SecurityException("Unable to read the configuration file " + configFilePath, ex);
+ }
+ finally
+ {
+ SecurityFactory.release();
+ }
+ }
+
+
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -25,7 +25,6 @@
@WebService
(
- portName = "SecurityServicePort",
serviceName = "SecurityService",
wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsse;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security username authorization test case
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public final class UsernameAuthorizationCustomFileTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize-custom";
+ private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(UsernameAuthorizationCustomFileTestCase.class, "jaxws-samples-wsse-username-authorize-custom.war");
+ }
+
+ public void testAuthorizedCustomConfig() throws Exception
+ {
+ doTestAuthorized(serviceURL, servicePort, "theKermit");
+ }
+
+private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ public void testUnauthenticated() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "foo");
+ try
+ {
+ proxy.sayHello();
+ fail("User foo should not be authenticated.");
+ }
+ catch (Exception ex)
+ {
+ //expected
+ }
+ }
+
+ public void testUnauthorizedCustomConfig() throws Exception
+ {
+ doTestUnauthorized(serviceURL, servicePort, "theKermit");
+ }
+
+private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
+ try
+ {
+ proxy.greetMe();
+ fail("User kermit should not be authorized to invoke greetMe.");
+ }
+ catch (Exception ex)
+ {
+ assertEquals("Unauthorized", ex.getMessage());
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy, String username)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String, Object> outProps = new HashMap<String, Object>();
+ outProps.put("action", "UsernameToken");
+ outProps.put("user", username);
+ outProps.put("passwordType", "PasswordText");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.UsernamePasswordCallback");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+ }
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -46,8 +46,10 @@
*/
public final class UsernameAuthorizationTestCase extends JBossWSTest
{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize";
-
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize/default-config";
+
+ private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
+
public static Test suite()
{
return new JBossWSTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war");
@@ -55,14 +57,19 @@
public void testAuthorized() throws Exception
{
+ doTestAuthorized(serviceURL, servicePort, "kermit");
+ }
+
+private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "kermit");
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
assertEquals("Secure Hello World!", proxy.sayHello());
}
-
+
public void testUnauthenticated() throws Exception
{
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
@@ -83,11 +90,16 @@
public void testUnauthorized() throws Exception
{
+ doTestUnauthorized(serviceURL, servicePort, "kermit");
+ }
+
+ private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "kermit");
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
try
{
proxy.greetMe();
@@ -98,7 +110,7 @@
assertEquals("Unauthorized", ex.getMessage());
}
}
-
+
private void setupWsse(ServiceIface proxy, String username)
{
Client client = ClientProxy.getClient(proxy);
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -35,6 +35,8 @@
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
if ("kermit".equals(pc.getIdentifier()))
pc.setPassword("thefrog");
+ else if ("theKermit".equals(pc.getIdentifier()))
+ pc.setPassword("thefrog2");
else
pc.setPassword("wrong password");
}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest;
-
-import java.util.Set;
-import java.util.HashSet;
-import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
-
-public class MemoryNonceStore implements NonceStore
-{
- private Set<String> nonces = new HashSet<String>();
-
- public boolean hasNonce(String nonce)
- {
- synchronized (nonces)
- {
- return nonces.contains(nonce);
- }
- }
-
- public void putNonce(String nonce)
- {
- synchronized (nonces)
- {
- nonces.add(nonce);
- }
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/MemoryNonceStore.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest;
+
+import java.util.Set;
+import java.util.HashSet;
+import org.jboss.wsf.stack.cxf.security.nonce.NonceStore;
+
+public class MemoryNonceStore implements NonceStore
+{
+ private Set<String> nonces = new HashSet<String>();
+
+ public boolean hasNonce(String nonce)
+ {
+ synchronized (nonces)
+ {
+ return nonces.contains(nonce);
+ }
+ }
+
+ public void putNonce(String nonce)
+ {
+ synchronized (nonces)
+ {
+ nonces.add(nonce);
+ }
+ }
+
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-@WebService
-(
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity"
-)
-public interface ServiceIface
-{
- @WebMethod
- String sayHello();
-
- @WebMethod
- String greetMe();
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceIface.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+
+ @WebMethod
+ String greetMe();
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest;
-
-import javax.jws.WebService;
-
-@WebService
-(
- serviceName = "SecurityService",
- wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
- targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceIface"
-)
-public class ServiceImpl implements ServiceIface
-{
- public String sayHello()
- {
- return "Secure Hello World!";
- }
- public String greetMe()
- {
- return "Greetings!";
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/ServiceImpl.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ serviceName = "SecurityService",
+ wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Secure Hello World!";
+ }
+ public String greetMe()
+ {
+ return "Greetings!";
+ }
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,130 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * WS-Security username authorization test case
- *
- * @author Sergey Beryozkin
- *
- */
-public final class UsernameDigestTestCase extends JBossWSTest
-{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-digest";
-
- private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
-
- public static Test suite()
- {
- return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war");
- }
-
- public void testAuthorized() throws Exception
- {
- doTestAuthorized(serviceURL, servicePort, "kermit");
- }
-
-private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
- setupWsse(proxy, userName);
- assertEquals("Secure Hello World!", proxy.sayHello());
- }
-
- public void testUnauthenticated() throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(serviceURL + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy, "foo");
- try
- {
- proxy.sayHello();
- fail("User foo should not be authenticated.");
- }
- catch (Exception ex)
- {
- //expected
- }
- }
-
- public void testUnauthorized() throws Exception
- {
- doTestUnauthorized(serviceURL, servicePort, "kermit");
- }
-
- private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
- {
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
- URL wsdlURL = new URL(endpointAddress + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
- setupWsse(proxy, userName);
- try
- {
- proxy.greetMe();
- fail("User kermit should not be authorized to invoke greetMe.");
- }
- catch (Exception ex)
- {
- assertEquals("Unauthorized", ex.getMessage());
- }
- }
-
- private void setupWsse(ServiceIface proxy, String username)
- {
- Client client = ClientProxy.getClient(proxy);
- Endpoint cxfEndpoint = client.getEndpoint();
-
- Map<String, Object> outProps = new HashMap<String, Object>();
- outProps.put("action", "UsernameToken");
- outProps.put("user", username);
- outProps.put("passwordType", "PasswordDigest");
- outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsseDigest.UsernamePasswordCallback");
- WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
- cxfEndpoint.getOutInterceptors().add(wssOut);
- cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
- }
-
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * WS-Security username authorization test case
+ *
+ * @author Sergey Beryozkin
+ *
+ */
+public final class UsernameDigestTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-digest";
+
+ private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityServicePort");
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.sar jaxws-samples-wsse-username-digest.war");
+ }
+
+ public void testAuthorized() throws Exception
+ {
+ doTestAuthorized(serviceURL, servicePort, "kermit");
+ }
+
+private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ public void testUnauthenticated() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "foo");
+ try
+ {
+ proxy.sayHello();
+ fail("User foo should not be authenticated.");
+ }
+ catch (Exception ex)
+ {
+ //expected
+ }
+ }
+
+ public void testUnauthorized() throws Exception
+ {
+ doTestUnauthorized(serviceURL, servicePort, "kermit");
+ }
+
+ private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class);
+ setupWsse(proxy, userName);
+ try
+ {
+ proxy.greetMe();
+ fail("User kermit should not be authorized to invoke greetMe.");
+ }
+ catch (Exception ex)
+ {
+ assertEquals("Unauthorized", ex.getMessage());
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy, String username)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String, Object> outProps = new HashMap<String, Object>();
+ outProps.put("action", "UsernameToken");
+ outProps.put("user", username);
+ outProps.put("passwordType", "PasswordDigest");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsseDigest.UsernamePasswordCallback");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+ }
+
+
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
-
-public class UsernamePasswordCallback implements CallbackHandler
-{
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if ("kermit".equals(pc.getIdentifier()))
- pc.setPassword("therealfrog");
- else
- pc.setPassword("wrong password");
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernamePasswordCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+
+public class UsernamePasswordCallback implements CallbackHandler
+{
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
+ if ("kermit".equals(pc.getIdentifier()))
+ pc.setPassword("therealfrog");
+ else
+ pc.setPassword("wrong password");
+ }
+}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class GreetMe {}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMe.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMe", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class GreetMe {}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class GreetMeResponse
-{
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- public String getReturn()
- {
- return this._return;
- }
-
- public void setReturn(String _return)
- {
- this._return = _return;
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/GreetMeResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMeResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class GreetMeResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class SayHello {}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHello.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHello {}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
-public class SayHelloResponse
-{
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- public String getReturn()
- {
- return this._return;
- }
-
- public void setReturn(String _return)
- {
- this._return = _return;
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/jaxws/SayHelloResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseDigest.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity")
+public class SayHelloResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-@WebService(name = "EjbEndpoint", targetNamespace = "http://org.jboss.ws/wsseEJB")
-public interface EjbEndpoint
-{
-
- @WebMethod
- public String sayHello();
-
- @WebMethod
- public String greetMe();
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpoint.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+@WebService(name = "EjbEndpoint", targetNamespace = "http://org.jboss.ws/wsseEJB")
+public interface EjbEndpoint
+{
+
+ @WebMethod
+ public String sayHello();
+
+ @WebMethod
+ public String greetMe();
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.logging.Logger;
-
-
-@Stateless(name = "EjbEndpoint")
-@WebService
-(
- name = "EjbEndpoint",
- serviceName = "EjbEndpointService",
- targetNamespace = "http://org.jboss.ws/wsseEJB"
-)
-@SecurityDomain("JBossWS")
-public class EjbEndpointImpl
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EjbEndpointImpl.class);
-
- @WebMethod
- @RolesAllowed("friend")
- public String sayHello()
- {
- log.info("Saying hello");
- return "hello";
- }
-
- @WebMethod
- @RolesAllowed("snoopies")
- public String greetMe()
- {
- log.info("Greeting");
- return "greetings";
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/EjbEndpointImpl.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.jboss.ejb3.annotation.SecurityDomain;
+import org.jboss.logging.Logger;
+
+
+@Stateless(name = "EjbEndpoint")
+@WebService
+(
+ name = "EjbEndpoint",
+ serviceName = "EjbEndpointService",
+ targetNamespace = "http://org.jboss.ws/wsseEJB"
+)
+@SecurityDomain("JBossWS")
+public class EjbEndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EjbEndpointImpl.class);
+
+ @WebMethod
+ @RolesAllowed("friend")
+ public String sayHello()
+ {
+ log.info("Saying hello");
+ return "hello";
+ }
+
+ @WebMethod
+ @RolesAllowed("snoopies")
+ public String greetMe()
+ {
+ log.info("Greeting");
+ return "greetings";
+ }
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "greetMe", namespace = "http://www.jboss.ws/wsseEJB")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "greetMe", namespace = "http://www.jboss.ws/wsseEJB")
-public class GreetMe {}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMe.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMe", namespace = "http://www.jboss.ws/wsseEJB")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMe", namespace = "http://www.jboss.ws/wsseEJB")
+public class GreetMe {}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "greetMeResponse", namespace = "http://www.jboss.ws/wsseEJB")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "greetMeResponse", namespace = "http://www.jboss.ws/wsseEJB")
-public class GreetMeResponse
-{
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- public String getReturn()
- {
- return this._return;
- }
-
- public void setReturn(String _return)
- {
- this._return = _return;
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/GreetMeResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "greetMeResponse", namespace = "http://www.jboss.ws/wsseEJB")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "greetMeResponse", namespace = "http://www.jboss.ws/wsseEJB")
+public class GreetMeResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.ws/wsseEJB")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHello", namespace = "http://www.jboss.ws/wsseEJB")
-public class SayHello {}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHello.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.ws/wsseEJB")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.ws/wsseEJB")
+public class SayHello {}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.ws/wsseEJB")
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.ws/wsseEJB")
-public class SayHelloResponse
-{
-
- @XmlElement(name = "return", namespace = "")
- private String _return;
-
- public String getReturn()
- {
- return this._return;
- }
-
- public void setReturn(String _return)
- {
- this._return = _return;
- }
-
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/SayHelloResponse.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.ws/wsseEJB")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.ws/wsseEJB")
+public class SayHelloResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.ws.security.WSPasswordCallback;
-
-public class UsernamePasswordCallback implements CallbackHandler
-{
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if ("kermit".equals(pc.getIdentifier()))
- pc.setPassword("thefrog");
- else if ("theKermit".equals(pc.getIdentifier()))
- pc.setPassword("thefrog2");
- else
- pc.setPassword("wrong password");
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/UsernamePasswordCallback.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import org.apache.ws.security.WSPasswordCallback;
+
+public class UsernamePasswordCallback implements CallbackHandler
+{
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
+ if ("kermit".equals(pc.getIdentifier()))
+ pc.setPassword("thefrog");
+ else if ("theKermit".equals(pc.getIdentifier()))
+ pc.setPassword("thefrog2");
+ else
+ pc.setPassword("wrong password");
+ }
+}
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsseEJB;
-
-import java.net.URL;
-import java.util.Map;
-import java.util.HashMap;
-
-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.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Secure EJB endpoint test
- *
- *
- * @author sberyozk(a)jredhat.com
- */
-public class WsseEjbTestCase extends JBossWSTest
-{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-wsseEJB/EjbEndpoint";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar");
- }
-
- private EjbEndpoint getPort() throws Exception
- {
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://org.jboss.ws/wsseEJB", "EjbEndpointService");
- EjbEndpoint port = Service.create(wsdlURL, serviceName).getPort(EjbEndpoint.class);
- return port;
- }
-
-
- public void testHello() throws Exception
- {
- EjbEndpoint proxy = getPort();
- setupWsse(proxy, "kermit");
- String retObj = proxy.sayHello();
- assertEquals("hello", retObj);
- }
-
- public void testGreetMeUnauthorized() throws Exception
- {
- EjbEndpoint proxy = getPort();
- setupWsse(proxy, "kermit");
- try
- {
- proxy.greetMe();
- fail("Unauthorized exception is expected");
- }
- catch (Exception ex)
- {
- assertEquals("Caller unauthorized", ex.getMessage());
- }
-
-
-
- }
-
- private void setupWsse(EjbEndpoint proxy, String username)
- {
- Client client = ClientProxy.getClient(proxy);
- Endpoint cxfEndpoint = client.getEndpoint();
-
- Map<String, Object> outProps = new HashMap<String, Object>();
- outProps.put("action", "UsernameToken");
- outProps.put("user", username);
- outProps.put("passwordType", "PasswordText");
- outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsseEJB.UsernamePasswordCallback");
- WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
- cxfEndpoint.getOutInterceptors().add(wssOut);
- cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
- }
-}
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsseEJB;
+
+import java.net.URL;
+import java.util.Map;
+import java.util.HashMap;
+
+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.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secure EJB endpoint test
+ *
+ *
+ * @author sberyozk(a)jredhat.com
+ */
+public class WsseEjbTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-wsseEJB/EjbEndpoint";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar");
+ }
+
+ private EjbEndpoint getPort() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/wsseEJB", "EjbEndpointService");
+ EjbEndpoint port = Service.create(wsdlURL, serviceName).getPort(EjbEndpoint.class);
+ return port;
+ }
+
+
+ public void testHello() throws Exception
+ {
+ EjbEndpoint proxy = getPort();
+ setupWsse(proxy, "kermit");
+ String retObj = proxy.sayHello();
+ assertEquals("hello", retObj);
+ }
+
+ public void testGreetMeUnauthorized() throws Exception
+ {
+ EjbEndpoint proxy = getPort();
+ setupWsse(proxy, "kermit");
+ try
+ {
+ proxy.greetMe();
+ fail("Unauthorized exception is expected");
+ }
+ catch (Exception ex)
+ {
+ assertEquals("Caller unauthorized", ex.getMessage());
+ }
+
+
+
+ }
+
+ private void setupWsse(EjbEndpoint proxy, String username)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+
+ Map<String, Object> outProps = new HashMap<String, Object>();
+ outProps.put("action", "UsernameToken");
+ outProps.put("user", username);
+ outProps.put("passwordType", "PasswordText");
+ outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsseEJB.UsernamePasswordCallback");
+ WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request
+ cxfEndpoint.getOutInterceptors().add(wssOut);
+ cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor());
+ }
+}
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -32,14 +32,16 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize'
- implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'
+ endpointName="ns:SecurityServicePort"
+ serviceName="ns:SecurityService"
+ xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity">
<jaxws:inInterceptors>
<ref bean="SecurityContextIn"/>
<ref bean="AuthorizeIn"/>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
-
-
+
</beans>
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -4,12 +4,16 @@
version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
<servlet>
<servlet-name>TestService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
</servlet>
+
<servlet-mapping>
<servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/default-config/*</url-pattern>
</servlet-mapping>
+
+
</web-app>
Modified: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2011-02-07 14:09:52 UTC (rev 13681)
@@ -54,7 +54,10 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize"/>
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config"/>
</port>
+ <port name="SecurityServicePort2" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/custom-config"/>
+ </port>
</service>
</definitions>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom)
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
- <security-domain>java:/jaas/custom</security-domain>
-</jboss-web>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <security-domain>java:/jaas/custom</security-domain>
+</jboss-web>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,40 +0,0 @@
-<beans
- xmlns='http://www.springframework.org/schema/beans'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xmlns:util='http://www.springframework.org/schema/util'
- xsi:schemaLocation='http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd'>
-
- <bean id="SecurityContextIn" class="org.jboss.test.ws.jaxws.samples.wsse.CustomSubjectCreatingInterceptor">
- <property name="securityConfigFile" value="login-config.xml"/>
- </bean>
-
- <util:map id="methodPermissions">
- <entry key="sayHello" value="theFriends"/>
- <entry key="greetMe" value="theSnoopies"/>
- </util:map>
-
- <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
- <property name="methodRolesMap" ref="methodPermissions"/>
- </bean>
-
- <jaxws:endpoint
- id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom'
- implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
- <jaxws:inInterceptors>
- <ref bean="SecurityContextIn"/>
- <ref bean="AuthorizeIn"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
- </jaxws:inInterceptors>
- </jaxws:endpoint>
-
-</beans>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,40 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:util='http://www.springframework.org/schema/util'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="SecurityContextIn" class="org.jboss.test.ws.jaxws.samples.wsse.CustomSubjectCreatingInterceptor">
+ <property name="securityConfigFile" value="login-config.xml"/>
+ </bean>
+
+ <util:map id="methodPermissions">
+ <entry key="sayHello" value="theFriends"/>
+ <entry key="greetMe" value="theSnoopies"/>
+ </util:map>
+
+ <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
+ <property name="methodRolesMap" ref="methodPermissions"/>
+ </bean>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom'
+ implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
+ <jaxws:inInterceptors>
+ <ref bean="SecurityContextIn"/>
+ <ref bean="AuthorizeIn"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+</beans>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,16 +0,0 @@
-<?xml version='1.0'?>
-
-<policy xmlns="urn:jboss:security-config:5.0"
->
-
- <application-policy name="custom">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- </login-module>
- </authentication>
- </application-policy>
-
-
-</policy>
-
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<policy xmlns="urn:jboss:security-config:5.0"
+>
+
+ <application-policy name="custom">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ </login-module>
+ </authentication>
+ </application-policy>
+
+
+</policy>
+
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,2 +0,0 @@
-# A sample roles.properties file for use with the UsersRolesLoginModule
-theKermit=theFriends
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+theKermit=theFriends
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-theKermit=thefrog2
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+theKermit=thefrog2
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <message name="greetMe">
- <part name="parameters" element="tns:greetMe"/>
- </message>
- <message name="greetMeResponse">
- <part name="parameters" element="tns:greetMeResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- <operation name="greetMe">
- <input message="tns:greetMe"/>
- <output message="tns:greetMeResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="greetMe">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom"/>
- </port>
- </service>
-</definitions>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <message name="greetMe">
+ <part name="parameters" element="tns:greetMe"/>
+ </message>
+ <message name="greetMeResponse">
+ <part name="parameters" element="tns:greetMeResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ <operation name="greetMe">
+ <input message="tns:greetMe"/>
+ <output message="tns:greetMeResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMe">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom"/>
+ </port>
+ </service>
+</definitions>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd 2010-06-09 21:54:52 UTC (rev 12454)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="greetMe" type="tns:greetMe"/>
-
- <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
-
- <xs:complexType name="greetMe">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="greetMeResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="greetMe" type="tns:greetMe"/>
+
+ <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
+
+ <xs:complexType name="greetMe">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="greetMeResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest)
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <!-- ==================================================================== -->
- <!-- Dynamic login config to install the login module using digest -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
- name="jboss:service=DynamicLoginConfig">
- <attribute name="AuthConfig">login-config.xml</attribute>
- <!-- The service which supports dynamic processing of login-config.xml
- configurations.
- -->
- <depends optional-attribute-name="LoginConfigService">
- jboss.security:service=XMLLoginConfig
- </depends>
- <!-- Optionally specify the security mgr service to use when
- this service is stopped to flush the auth caches of the domains
- registered by this service.
- -->
- <depends optional-attribute-name="SecurityManagerService">
- jboss.security:service=JaasSecurityManager
- </depends>
- </mbean>
-</server>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <!-- ==================================================================== -->
+ <!-- Dynamic login config to install the login module using digest -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+ name="jboss:service=DynamicLoginConfig">
+ <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
+ <!-- The service which supports dynamic processing of login-config.xml
+ configurations.
+ -->
+ <depends optional-attribute-name="LoginConfigService">
+ jboss.security:service=XMLLoginConfig
+ </depends>
+ <!-- Optionally specify the security mgr service to use when
+ this service is stopped to flush the auth caches of the domains
+ registered by this service.
+ -->
+ <depends optional-attribute-name="SecurityManagerService">
+ jboss.security:service=JaasSecurityManager
+ </depends>
+ </mbean>
+</server>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
- <security-domain>java:/jaas/JBossWSDigest</security-domain>
-</jboss-web>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <security-domain>java:/jaas/JBossWSDigest</security-domain>
+</jboss-web>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,54 +0,0 @@
-<beans
- xmlns='http://www.springframework.org/schema/beans'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xmlns:util='http://www.springframework.org/schema/util'
- xsi:schemaLocation='http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd'>
-
- <bean id="nonceStore" class="org.jboss.test.ws.jaxws.samples.wsseDigest.MemoryNonceStore"/>
-
- <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken"/>
- </map>
- </constructor-arg>
- <property name="nonceStore" ref="nonceStore"/>
- <property name="supportDigestPasswords" value="true"/>
- </bean>
-
- <util:map id="methodPermissions">
- <entry key="sayHello" value="friend"/>
- <entry key="greetMe" value="snoopies"/>
- </util:map>
-
- <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
- <property name="methodRolesMap" ref="methodPermissions"/>
- </bean>
-
- <jaxws:endpoint
- id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest'
- implementor='org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl'
- endpointName="ns:SecurityServicePort"
- serviceName="ns:SecurityService"
- xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity">
- <jaxws:inInterceptors>
- <ref bean="SecurityContextIn"/>
- <ref bean="AuthorizeIn"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
-<!--
- <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
--->
- </jaxws:inInterceptors>
- </jaxws:endpoint>
-
-</beans>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,54 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:util='http://www.springframework.org/schema/util'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="nonceStore" class="org.jboss.test.ws.jaxws.samples.wsseDigest.MemoryNonceStore"/>
+
+ <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken"/>
+ </map>
+ </constructor-arg>
+ <property name="nonceStore" ref="nonceStore"/>
+ <property name="supportDigestPasswords" value="true"/>
+ </bean>
+
+ <util:map id="methodPermissions">
+ <entry key="sayHello" value="friend"/>
+ <entry key="greetMe" value="snoopies"/>
+ </util:map>
+
+ <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor">
+ <property name="methodRolesMap" ref="methodPermissions"/>
+ </bean>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest'
+ implementor='org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl'
+ endpointName="ns:SecurityServicePort"
+ serviceName="ns:SecurityService"
+ xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity">
+ <jaxws:inInterceptors>
+ <ref bean="SecurityContextIn"/>
+ <ref bean="AuthorizeIn"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+<!--
+ <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
+-->
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+</beans>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,2 +0,0 @@
-# A sample roles.properties file for use with the UsersRolesLoginModule
-kermit=friend
\ No newline at end of file
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+kermit=friend
\ No newline at end of file
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-kermit=therealfrog
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+kermit=therealfrog
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,25 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-<policy> <!-- xmlns="urn:jboss:security-config:5.0"> -->
-
- <application-policy name="JBossWSDigest">
- <authentication>
- <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required">
- <module-option name="usersProperties">jbossws-users.properties</module-option>
- <module-option name="rolesProperties">jbossws-roles.properties</module-option>
- <module-option name="hashAlgorithm">SHA</module-option>
- <module-option name="hashEncoding">BASE64</module-option>
- <module-option name="hashCharset">UTF-8</module-option>
- <module-option name="hashUserPassword">false</module-option>
- <module-option name="hashStorePassword">true</module-option>
- <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option>
- <module-option name="unauthenticatedIdentity">anonymous</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
-
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+<policy>
+
+ <application-policy name="JBossWSDigest">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option>
+ <module-option name="hashAlgorithm">SHA</module-option>
+ <module-option name="hashEncoding">BASE64</module-option>
+ <module-option name="hashCharset">UTF-8</module-option>
+ <module-option name="hashUserPassword">false</module-option>
+ <module-option name="hashStorePassword">true</module-option>
+ <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+</policy>
+
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app
- version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-
-</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/web.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+
+</web-app>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl)
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
- xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="sayHello">
- <part name="parameters" element="tns:sayHello"/>
- </message>
- <message name="sayHelloResponse">
- <part name="parameters" element="tns:sayHelloResponse"/>
- </message>
- <message name="greetMe">
- <part name="parameters" element="tns:greetMe"/>
- </message>
- <message name="greetMeResponse">
- <part name="parameters" element="tns:greetMeResponse"/>
- </message>
- <portType name="ServiceIface">
- <operation name="sayHello">
- <input message="tns:sayHello"/>
- <output message="tns:sayHelloResponse"/>
- </operation>
- <operation name="greetMe">
- <input message="tns:greetMe"/>
- <output message="tns:greetMeResponse"/>
- </operation>
- </portType>
- <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="sayHello">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="greetMe">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="SecurityService">
- <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest"/>
- </port>
- </service>
-</definitions>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <message name="greetMe">
+ <part name="parameters" element="tns:greetMe"/>
+ </message>
+ <message name="greetMeResponse">
+ <part name="parameters" element="tns:greetMeResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ <operation name="greetMe">
+ <input message="tns:greetMe"/>
+ <output message="tns:greetMeResponse"/>
+ </operation>
+ </portType>
+ <binding name="SecurityServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMe">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecurityService">
+ <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest"/>
+ </port>
+ </service>
+</definitions>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd 2010-06-17 13:05:59 UTC (rev 12495)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="sayHello" type="tns:sayHello"/>
-
- <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
-
- <xs:complexType name="sayHello">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="sayHelloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="greetMe" type="tns:greetMe"/>
-
- <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
-
- <xs:complexType name="greetMe">
- <xs:sequence/>
- </xs:complexType>
-
- <xs:complexType name="greetMeResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd (from rev 12495, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="greetMe" type="tns:greetMe"/>
+
+ <xs:element name="greetMeResponse" type="tns:greetMeResponse"/>
+
+ <xs:complexType name="greetMe">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="greetMeResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB)
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF)
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml (from rev 12454, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,7 @@
+<?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>java:/jaas/JBossWS</security-domain>
+</jboss>
Deleted: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2010-06-09 11:00:55 UTC (rev 12449)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -1,46 +0,0 @@
-<beans
- xmlns='http://www.springframework.org/schema/beans'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xmlns:beans='http://www.springframework.org/schema/beans'
- xmlns:jaxws='http://cxf.apache.org/jaxws'
- xmlns:util='http://www.springframework.org/schema/util'
- xsi:schemaLocation='http://cxf.apache.org/core
- http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://cxf.apache.org/jaxws
- http://cxf.apache.org/schemas/jaxws.xsd'>
-
- <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
- <constructor-arg>
- <map>
- <entry key="action" value="UsernameToken"/>
- </map>
- </constructor-arg>
-
- <property name="propagateContext" value="true"/>
-
- </bean>
-
- <jaxws:endpoint
- id='EjbEndpointImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsseEJB/EjbEndpoint'
- implementor='org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpointImpl'>
- <jaxws:invoker>
- <bean class='org.jboss.wsf.stack.cxf.InvokerEJB3'/>
- </jaxws:invoker>
-
- <jaxws:inInterceptors>
-
- <ref bean="SecurityContextIn"/>
- <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
-
- </jaxws:inInterceptors>
-
- </jaxws:endpoint>
-
-
-
-</beans>
Copied: stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml (from rev 12449, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml)
===================================================================
--- stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/JBPAPP-5764/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -0,0 +1,46 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:util='http://www.springframework.org/schema/util'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="SecurityContextIn" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken"/>
+ </map>
+ </constructor-arg>
+
+ <property name="propagateContext" value="true"/>
+
+ </bean>
+
+ <jaxws:endpoint
+ id='EjbEndpointImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsseEJB/EjbEndpoint'
+ implementor='org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpointImpl'>
+ <jaxws:invoker>
+ <bean class='org.jboss.wsf.stack.cxf.InvokerEJB3'/>
+ </jaxws:invoker>
+
+ <jaxws:inInterceptors>
+
+ <ref bean="SecurityContextIn"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+
+ </jaxws:inInterceptors>
+
+ </jaxws:endpoint>
+
+
+
+</beans>
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-06 00:06:31 UTC (rev 13680)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-02-07 14:09:52 UTC (rev 13681)
@@ -59,6 +59,9 @@
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
+ <jboss.security.sx.version>2.0.4</jboss.security.sx.version>
+ <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
+ <picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
@@ -471,7 +474,35 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.xb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>${jboss.security.sx.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox-bare</artifactId>
+ <version>${picketbox.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId>
<version>${jboss.security.spi.version}</version>
<scope>provided</scope>
13 years, 7 months
JBossWS SVN: r13680 - hudson/trunk/hudson-home/jobs/AS-7.0.0.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-05 19:06:31 -0500 (Sat, 05 Feb 2011)
New Revision: 13680
Modified:
hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml
Log:
[JBWS-3208] Using https url to workaround jbossws host fw
Modified: hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-05 23:32:16 UTC (rev 13679)
+++ hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-06 00:06:31 UTC (rev 13680)
@@ -23,7 +23,7 @@
<string>uploadpack</string>
<string>git-upload-pack</string>
<string>url</string>
- <string>git://github.com/jbossas/jboss-as.git</string>
+ <string>https://github.com/jbossas/jboss-as.git</string>
<string>tagopt</string>
<string></string>
</org.spearce.jgit.transport.RemoteConfig>
13 years, 7 months