You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/09/01 18:51:24 UTC
svn commit: r1164163 [1/2] - in /cxf/trunk:
common/common/src/main/java/org/apache/cxf/staxutils/transform/
common/common/src/test/java/org/apache/cxf/staxutils/resources/
distribution/src/main/release/bin/
distribution/src/main/release/samples/in_jvm_...
Author: dkulp
Date: Thu Sep 1 16:51:21 2011
New Revision: 1164163
URL: http://svn.apache.org/viewvc?rev=1164163&view=rev
Log:
Set some svn properties
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml (props changed)
cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml (props changed)
cxf/trunk/distribution/src/main/release/bin/wadl2java.bat (props changed)
cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/DispatchSourceClient.java (props changed)
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/certs/gencerts.sh (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt (contents, props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java (contents, props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java (contents, props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java (contents, props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java (contents, props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml (props changed)
cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml (props changed)
cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionStatus.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM10PolicyUtils.java (props changed)
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM11AssertionBuilder.java (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xjb (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xsd (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xsd (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb (props changed)
cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xsd (props changed)
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java (props changed)
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java (props changed)
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml (props changed)
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/resources/Acknowledgment2.xml (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KerberosTokenBuilder.java (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java (contents, props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KerberosToken.java (props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java (contents, props changed)
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java (props changed)
cxf/trunk/rt/ws/security/src/main/model/binding14.xjb (props changed)
cxf/trunk/rt/ws/security/src/main/model/ws-trust-1.4.xsd (props changed)
cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh (props changed)
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GreeterImplSoap12.java (props changed)
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java (props changed)
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/Soap12Server.java (props changed)
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/soap12Bus.xml (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/DoubleItImpl.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/Server.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java (contents, props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java (props changed)
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml (props changed)
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml (props changed)
cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/kerberos/DoubleItKerberos.wsdl (props changed)
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ManagedEndpointsTest.java (props changed)
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/expire-fast-seq.xml (props changed)
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/managed-client.xml (props changed)
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/managed-server.xml (props changed)
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn1nospace.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/AddRequestIn2nospace.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/amazonIn1nospace.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq1partial.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq2partial.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq3partial.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReq4partial.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/complexReqIn4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReq.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/staxutils/resources/greetMeReqIn4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/bin/wadl2java.bat
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/demo/colocated/client/DispatchSourceClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/certs/gencerts.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/certs/gencerts.sh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/Customer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLInitializationError.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLProtocolSocketFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/org/apache/commons/httpclient/contrib/ssl/AuthSSLX509TrustManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ClientConfig.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt Thu Sep 1 16:51:21 2011
@@ -1,74 +1,74 @@
-JMS Spring Config Demo
-==================
-
-This is basically the wsdl first demo adapted to the jms transport. It uses the jms config feature so the jms transport can be
-added to any existing service without changing the wsdl.
-
-The Demo consist of three parts:
-
-- Creating the server and client code stubs from the WSDL
-- Service implementation (using Spring)
-- Client implementation (using Spring)
-
-Server implementation
----------------------
-
-The service is implemented in the class CustomerServiceImpl. The class simply implements the previously
-generated service interface. The method getCustomersByName demonstrates how a query function could look like.
-The idea is to search and return all customers with the given name. If the searched name is none then the method
-returns an exception to indicate that no matching customer was found. (In a real implementation probably a list with
-zero objects would be used. This is mainly to show how custom exceptions can be used).
-For any other name the method will return a list of two Customer objects. The number of objects can be increased to
-test how fast CXF works for larger data.
-
-Now that the service is implemented it needs to be made available. In this example a standalone server is used.
-This can be done either with the JAX-WS API demonstrated in the class CustomerService or using a spring config as
-demonstrated in the class CustomerServiceSpringServer.
-
-Client implementation
----------------------
-
-The main client code lives in the class CustomerServiceTester. This class needs a proxy to the service and then
-demonstrates some calls and their expected outcome using junit assertions.
-
-The first call is a request getCustomersByName for all customers with name "Smith". The result is then checked.
-Then the same method is called with the invalid name "None". In this case a NoSuchCustomerException is expected.
-The third call shows that the one way method updateCustomer will return instantly even if the service needs some
-time to process the request.
-
-The classes CustomerServiceClient and CustomerServiceSpringClient show how to get a service proxy using JAX-WS
-or Spring and how to wire it to your business class (in this case CustomerServiceTester).
-
-Prerequisite
-------------
-
-Please review the README in the samples main directory before continuing.
-
-Building and running the demo using Maven
----------------------------------------
-
-From the base directory of this sample (i.e., where this README file is
-located), the pom.xml file is used to build and run the demo.
-
-Using either UNIX or Windows:
-
- mvn install (builds the demo)
- mvn -Pjms.broker (from one command line window)
- mvn -Pserver (from as second command line window)
- mvn -Pclient (from a third command line window)
-
-To remove the code generated from the WSDL file and the .class
-files, run "mvn clean".
-
-
-Using eclipse to run and test the demo
---------------------------------------
-
-run the following in the demo base directory
-
-mvn eclipse:eclipse
-
-Then use Import / Existing projects into workspace and browse to the wsdl_first directory. Import the wsdl_first project.
-
-The demo can now be started using "Run as Java Application" on the classes CustomerServiceSpringClient.java
-or CustomerServiceSpringServer.java
+JMS Spring Config Demo
+==================
+
+This is basically the wsdl first demo adapted to the jms transport. It uses the jms config feature so the jms transport can be
+added to any existing service without changing the wsdl.
+
+The Demo consist of three parts:
+
+- Creating the server and client code stubs from the WSDL
+- Service implementation (using Spring)
+- Client implementation (using Spring)
+
+Server implementation
+---------------------
+
+The service is implemented in the class CustomerServiceImpl. The class simply implements the previously
+generated service interface. The method getCustomersByName demonstrates how a query function could look like.
+The idea is to search and return all customers with the given name. If the searched name is none then the method
+returns an exception to indicate that no matching customer was found. (In a real implementation probably a list with
+zero objects would be used. This is mainly to show how custom exceptions can be used).
+For any other name the method will return a list of two Customer objects. The number of objects can be increased to
+test how fast CXF works for larger data.
+
+Now that the service is implemented it needs to be made available. In this example a standalone server is used.
+This can be done either with the JAX-WS API demonstrated in the class CustomerService or using a spring config as
+demonstrated in the class CustomerServiceSpringServer.
+
+Client implementation
+---------------------
+
+The main client code lives in the class CustomerServiceTester. This class needs a proxy to the service and then
+demonstrates some calls and their expected outcome using junit assertions.
+
+The first call is a request getCustomersByName for all customers with name "Smith". The result is then checked.
+Then the same method is called with the invalid name "None". In this case a NoSuchCustomerException is expected.
+The third call shows that the one way method updateCustomer will return instantly even if the service needs some
+time to process the request.
+
+The classes CustomerServiceClient and CustomerServiceSpringClient show how to get a service proxy using JAX-WS
+or Spring and how to wire it to your business class (in this case CustomerServiceTester).
+
+Prerequisite
+------------
+
+Please review the README in the samples main directory before continuing.
+
+Building and running the demo using Maven
+---------------------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located), the pom.xml file is used to build and run the demo.
+
+Using either UNIX or Windows:
+
+ mvn install (builds the demo)
+ mvn -Pjms.broker (from one command line window)
+ mvn -Pserver (from as second command line window)
+ mvn -Pclient (from a third command line window)
+
+To remove the code generated from the WSDL file and the .class
+files, run "mvn clean".
+
+
+Using eclipse to run and test the demo
+--------------------------------------
+
+run the following in the demo base directory
+
+mvn eclipse:eclipse
+
+Then use Import / Existing projects into workspace and browse to the wsdl_first directory. Import the wsdl_first project.
+
+The demo can now be started using "Run as Java Application" on the classes CustomerServiceSpringClient.java
+or CustomerServiceSpringServer.java
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java Thu Sep 1 16:51:21 2011
@@ -1,39 +1,39 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.example.customerservice.client;
-
-
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public final class CustomerServiceSpringClient {
-
- private CustomerServiceSpringClient() {
- }
-
- public static void main(String args[]) throws Exception {
- // Initialize the spring context and fetch our test client
- ClassPathXmlApplicationContext context
- = new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
- CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
-
- client.testCustomerService();
- System.exit(0);
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.customerservice.client;
+
+
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public final class CustomerServiceSpringClient {
+
+ private CustomerServiceSpringClient() {
+ }
+
+ public static void main(String args[]) throws Exception {
+ // Initialize the spring context and fetch our test client
+ ClassPathXmlApplicationContext context
+ = new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
+ CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
+
+ client.testCustomerService();
+ System.exit(0);
+ }
+}
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java Thu Sep 1 16:51:21 2011
@@ -1,75 +1,75 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.example.customerservice.client;
-
-import java.util.List;
-
-import junit.framework.Assert;
-
-import com.example.customerservice.Customer;
-import com.example.customerservice.CustomerService;
-import com.example.customerservice.NoSuchCustomerException;
-
-public final class CustomerServiceTester {
-
- // The CustomerService proxy will be injected either by spring or by a direct call to the setter
- CustomerService customerService;
-
- public CustomerService getCustomerService() {
- return customerService;
- }
-
- public void setCustomerService(CustomerService customerService) {
- this.customerService = customerService;
- }
-
- public void testCustomerService() throws NoSuchCustomerException {
- List<Customer> customers = null;
-
- // First we test the positive case where customers are found and we retreive
- // a list of customers
- System.out.println("Sending request for customers named Smith");
- customers = customerService.getCustomersByName("Smith");
- System.out.println("Response received");
- Assert.assertEquals(2, customers.size());
- Assert.assertEquals("Smith", customers.get(0).getName());
-
- // Then we test for an unknown Customer name and expect the NoSuchCustomerException
- try {
- customers = customerService.getCustomersByName("None");
- Assert.fail("We should get a NoSuchCustomerException here");
- } catch (NoSuchCustomerException e) {
- System.out.println(e.getMessage());
- Assert.assertNotNull("FaultInfo must not be null", e.getFaultInfo());
- Assert.assertEquals("None", e.getFaultInfo().getCustomerName());
- System.out.println("NoSuchCustomer exception was received as expected");
- }
-
- // The implementation of updateCustomer is set to sleep for some seconds.
- // Still this method should return instantly as the method is declared
- // as a one way method in the WSDL
- Customer customer = new Customer();
- customer.setName("Smith");
- customerService.updateCustomer(customer);
-
- System.out.println("All calls were successful");
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.example.customerservice.client;
+
+import java.util.List;
+
+import junit.framework.Assert;
+
+import com.example.customerservice.Customer;
+import com.example.customerservice.CustomerService;
+import com.example.customerservice.NoSuchCustomerException;
+
+public final class CustomerServiceTester {
+
+ // The CustomerService proxy will be injected either by spring or by a direct call to the setter
+ CustomerService customerService;
+
+ public CustomerService getCustomerService() {
+ return customerService;
+ }
+
+ public void setCustomerService(CustomerService customerService) {
+ this.customerService = customerService;
+ }
+
+ public void testCustomerService() throws NoSuchCustomerException {
+ List<Customer> customers = null;
+
+ // First we test the positive case where customers are found and we retreive
+ // a list of customers
+ System.out.println("Sending request for customers named Smith");
+ customers = customerService.getCustomersByName("Smith");
+ System.out.println("Response received");
+ Assert.assertEquals(2, customers.size());
+ Assert.assertEquals("Smith", customers.get(0).getName());
+
+ // Then we test for an unknown Customer name and expect the NoSuchCustomerException
+ try {
+ customers = customerService.getCustomersByName("None");
+ Assert.fail("We should get a NoSuchCustomerException here");
+ } catch (NoSuchCustomerException e) {
+ System.out.println(e.getMessage());
+ Assert.assertNotNull("FaultInfo must not be null", e.getFaultInfo());
+ Assert.assertEquals("None", e.getFaultInfo().getCustomerName());
+ System.out.println("NoSuchCustomer exception was received as expected");
+ }
+
+ // The implementation of updateCustomer is set to sleep for some seconds.
+ // Still this method should return instantly as the method is declared
+ // as a one way method in the WSDL
+ Customer customer = new Customer();
+ customer.setName("Smith");
+ customerService.updateCustomer(customer);
+
+ System.out.println("All calls were successful");
+ }
+
+}
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java Thu Sep 1 16:51:21 2011
@@ -1,80 +1,80 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.example.customerservice.server;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
-
-import com.example.customerservice.Customer;
-import com.example.customerservice.CustomerService;
-import com.example.customerservice.CustomerType;
-import com.example.customerservice.NoSuchCustomer;
-import com.example.customerservice.NoSuchCustomerException;
-
-public class CustomerServiceImpl implements CustomerService {
-
- /**
- * The WebServiceContext can be used to retrieve special attributes like the
- * user principal. Normally it is not needed
- */
- @Resource
- WebServiceContext wsContext;
-
- public List<Customer> getCustomersByName(String name) throws NoSuchCustomerException {
- if ("None".equals(name)) {
- NoSuchCustomer noSuchCustomer = new NoSuchCustomer();
- noSuchCustomer.setCustomerName(name);
- throw new NoSuchCustomerException("Did not find any matching customer for name=" + name,
- noSuchCustomer);
- }
-
- List<Customer> customers = new ArrayList<Customer>();
- for (int c = 0; c < 2; c++) {
- Customer cust = new Customer();
- cust.setName(name);
- cust.getAddress().add("Pine Street 200");
- Date bDate = new GregorianCalendar(2009, 01, 01).getTime();
- cust.setBirthDate(bDate);
- cust.setNumOrders(1);
- cust.setRevenue(10000);
- cust.setTest(new BigDecimal(1.5));
- cust.setType(CustomerType.BUSINESS);
- customers.add(cust);
- }
-
- return customers;
- }
-
- public void updateCustomer(Customer customer) {
- System.out.println("update request was received");
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- // Nothing to do here
- }
- System.out.println("Customer was updated");
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.customerservice.server;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.xml.ws.WebServiceContext;
+
+import com.example.customerservice.Customer;
+import com.example.customerservice.CustomerService;
+import com.example.customerservice.CustomerType;
+import com.example.customerservice.NoSuchCustomer;
+import com.example.customerservice.NoSuchCustomerException;
+
+public class CustomerServiceImpl implements CustomerService {
+
+ /**
+ * The WebServiceContext can be used to retrieve special attributes like the
+ * user principal. Normally it is not needed
+ */
+ @Resource
+ WebServiceContext wsContext;
+
+ public List<Customer> getCustomersByName(String name) throws NoSuchCustomerException {
+ if ("None".equals(name)) {
+ NoSuchCustomer noSuchCustomer = new NoSuchCustomer();
+ noSuchCustomer.setCustomerName(name);
+ throw new NoSuchCustomerException("Did not find any matching customer for name=" + name,
+ noSuchCustomer);
+ }
+
+ List<Customer> customers = new ArrayList<Customer>();
+ for (int c = 0; c < 2; c++) {
+ Customer cust = new Customer();
+ cust.setName(name);
+ cust.getAddress().add("Pine Street 200");
+ Date bDate = new GregorianCalendar(2009, 01, 01).getTime();
+ cust.setBirthDate(bDate);
+ cust.setNumOrders(1);
+ cust.setRevenue(10000);
+ cust.setTest(new BigDecimal(1.5));
+ cust.setType(CustomerType.BUSINESS);
+ customers.add(cust);
+ }
+
+ return customers;
+ }
+
+ public void updateCustomer(Customer customer) {
+ System.out.println("update request was received");
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ // Nothing to do here
+ }
+ System.out.println("Customer was updated");
+ }
+
+}
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java Thu Sep 1 16:51:21 2011
@@ -1,32 +1,32 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.example.customerservice.server;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class CustomerServiceSpringServer {
-
- protected CustomerServiceSpringServer() {
- }
-
- public static void main(String args[]) throws Exception {
- new ClassPathXmlApplicationContext("server-applicationContext.xml");
- System.in.read();
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.example.customerservice.server;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class CustomerServiceSpringServer {
+
+ protected CustomerServiceSpringServer() {
+ }
+
+ public static void main(String args[]) throws Exception {
+ new ClassPathXmlApplicationContext("server-applicationContext.xml");
+ System.in.read();
+ }
+}
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/resources/client-applicationContext.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/src/main/resources/server-applicationContext.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/distribution/src/main/release/samples/jms_spring_config/wsdl/binding.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10AImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder10Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/EncoderDecoder11Impl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ManagedRMManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ProtocolVariation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM10Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RM11Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RetransmissionStatus.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM10PolicyUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM11AssertionBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrmp-1.1-schema-200702.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0-wsa15.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.0.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/main/resources/schemas/wsdl/wsrm-1.1.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/managed-manager-bean.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/resources/Acknowledgment2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/KerberosTokenBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java Thu Sep 1 16:51:21 2011
@@ -1,93 +1,93 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.ws.security.policy.builders;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.ws.policy.PolicyAssertion;
-import org.apache.cxf.ws.policy.PolicyBuilder;
-import org.apache.cxf.ws.policy.PolicyConstants;
-import org.apache.cxf.ws.security.policy.SP11Constants;
-import org.apache.cxf.ws.security.policy.SP12Constants;
-import org.apache.cxf.ws.security.policy.SPConstants;
-import org.apache.cxf.ws.security.policy.model.SpnegoContextToken;
-
-import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
-import org.apache.neethi.builders.AssertionBuilder;
-
-/**
- *
- */
-public class SpnegoContextTokenBuilder implements AssertionBuilder<Element> {
-
- PolicyBuilder builder;
- public SpnegoContextTokenBuilder(PolicyBuilder b) {
- builder = b;
- }
- public QName[] getKnownElements() {
- return new QName[]{SP11Constants.SPNEGO_CONTEXT_TOKEN, SP12Constants.SPNEGO_CONTEXT_TOKEN};
- }
-
- public PolicyAssertion build(Element element, AssertionBuilderFactory factory)
- throws IllegalArgumentException {
- SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
- ? SP11Constants.INSTANCE : SP12Constants.INSTANCE;
-
- SpnegoContextToken spnegoContextToken = new SpnegoContextToken(consts);
- spnegoContextToken.setOptional(PolicyConstants.isOptional(element));
- spnegoContextToken.setIgnorable(PolicyConstants.isIgnorable(element));
-
- String attribute = DOMUtils.getAttribute(element, consts.getIncludeToken());
- if (attribute == null) {
- throw new IllegalArgumentException("SpnegoContextToken doesn't contain "
- + "any sp:IncludeToken attribute");
- }
-
- String inclusionValue = attribute.trim();
-
- spnegoContextToken.setInclusion(consts.getInclusionFromAttributeValue(inclusionValue));
-
- Element elem = DOMUtils.getFirstElement(element);
- while (elem != null) {
- QName qn = DOMUtils.getElementQName(elem);
- if (Constants.isPolicyElement(qn)) {
- if (DOMUtils.getFirstChildWithName(elem, consts.getNamespace(),
- SPConstants.REQUIRE_DERIVED_KEYS) != null) {
- spnegoContextToken.setDerivedKeys(true);
- } else if (DOMUtils.getFirstChildWithName(elem,
- SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS) != null) {
- spnegoContextToken.setImpliedDerivedKeys(true);
- } else if (DOMUtils.getFirstChildWithName(elem,
- SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS) != null) {
- spnegoContextToken.setExplicitDerivedKeys(true);
- }
- } else if (consts.getNamespace().equals(qn.getNamespaceURI())
- && SPConstants.ISSUER.equals(qn.getLocalPart())) {
- spnegoContextToken.setIssuerEpr(DOMUtils.getFirstElement(elem));
- }
- elem = DOMUtils.getNextElement(elem);
- }
- return spnegoContextToken;
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.ws.security.policy.builders;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.ws.policy.PolicyAssertion;
+import org.apache.cxf.ws.policy.PolicyBuilder;
+import org.apache.cxf.ws.policy.PolicyConstants;
+import org.apache.cxf.ws.security.policy.SP11Constants;
+import org.apache.cxf.ws.security.policy.SP12Constants;
+import org.apache.cxf.ws.security.policy.SPConstants;
+import org.apache.cxf.ws.security.policy.model.SpnegoContextToken;
+
+import org.apache.neethi.AssertionBuilderFactory;
+import org.apache.neethi.Constants;
+import org.apache.neethi.builders.AssertionBuilder;
+
+/**
+ *
+ */
+public class SpnegoContextTokenBuilder implements AssertionBuilder<Element> {
+
+ PolicyBuilder builder;
+ public SpnegoContextTokenBuilder(PolicyBuilder b) {
+ builder = b;
+ }
+ public QName[] getKnownElements() {
+ return new QName[]{SP11Constants.SPNEGO_CONTEXT_TOKEN, SP12Constants.SPNEGO_CONTEXT_TOKEN};
+ }
+
+ public PolicyAssertion build(Element element, AssertionBuilderFactory factory)
+ throws IllegalArgumentException {
+ SPConstants consts = SP11Constants.SP_NS.equals(element.getNamespaceURI())
+ ? SP11Constants.INSTANCE : SP12Constants.INSTANCE;
+
+ SpnegoContextToken spnegoContextToken = new SpnegoContextToken(consts);
+ spnegoContextToken.setOptional(PolicyConstants.isOptional(element));
+ spnegoContextToken.setIgnorable(PolicyConstants.isIgnorable(element));
+
+ String attribute = DOMUtils.getAttribute(element, consts.getIncludeToken());
+ if (attribute == null) {
+ throw new IllegalArgumentException("SpnegoContextToken doesn't contain "
+ + "any sp:IncludeToken attribute");
+ }
+
+ String inclusionValue = attribute.trim();
+
+ spnegoContextToken.setInclusion(consts.getInclusionFromAttributeValue(inclusionValue));
+
+ Element elem = DOMUtils.getFirstElement(element);
+ while (elem != null) {
+ QName qn = DOMUtils.getElementQName(elem);
+ if (Constants.isPolicyElement(qn)) {
+ if (DOMUtils.getFirstChildWithName(elem, consts.getNamespace(),
+ SPConstants.REQUIRE_DERIVED_KEYS) != null) {
+ spnegoContextToken.setDerivedKeys(true);
+ } else if (DOMUtils.getFirstChildWithName(elem,
+ SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS) != null) {
+ spnegoContextToken.setImpliedDerivedKeys(true);
+ } else if (DOMUtils.getFirstChildWithName(elem,
+ SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS) != null) {
+ spnegoContextToken.setExplicitDerivedKeys(true);
+ }
+ } else if (consts.getNamespace().equals(qn.getNamespaceURI())
+ && SPConstants.ISSUER.equals(qn.getLocalPart())) {
+ spnegoContextToken.setIssuerEpr(DOMUtils.getFirstElement(elem));
+ }
+ elem = DOMUtils.getNextElement(elem);
+ }
+ return spnegoContextToken;
+ }
+
+}
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SpnegoContextTokenBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KerberosToken.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java Thu Sep 1 16:51:21 2011
@@ -1,139 +1,139 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.ws.security.policy.model;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.w3c.dom.Element;
-
-import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.ws.security.policy.SP12Constants;
-import org.apache.cxf.ws.security.policy.SPConstants;
-
-/**
- * Model class for SpnegoContextToken
- */
-public class SpnegoContextToken extends Token {
-
- private Element issuerEpr;
-
- public SpnegoContextToken(SPConstants version) {
- super(version);
- }
-
- public QName getName() {
- return SP12Constants.INSTANCE.getKerberosToken();
- }
-
- /**
- * @return Returns the issuerEpr.
- */
- public Element getIssuerEpr() {
- return issuerEpr;
- }
-
- /**
- * @param issuerEpr The issuerEpr to set.
- */
- public void setIssuerEpr(Element issuerEpr) {
- this.issuerEpr = issuerEpr;
- }
-
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- QName name = constants.getSpnegoContextToken();
- String localname = name.getLocalPart();
- String namespaceURI = name.getNamespaceURI();
- String prefix;
-
- String writerPrefix = writer.getPrefix(namespaceURI);
-
- if (writerPrefix == null) {
- prefix = name.getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- } else {
- prefix = writerPrefix;
- }
-
- // <sp:SpnegoContextToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- if (writerPrefix == null) {
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
- }
-
- String inclusion;
-
- inclusion = constants.getAttributeValueFromInclusion(getInclusion());
-
- if (inclusion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
- }
-
- if (issuerEpr != null) {
- // <sp:Issuer>
- writer.writeStartElement(prefix, SPConstants.ISSUER, namespaceURI);
-
- StaxUtils.copy(issuerEpr, writer);
-
- writer.writeEndElement();
- }
-
- if (isDerivedKeys()) {
-
- String wspNamespaceURI = SPConstants.POLICY.getNamespaceURI();
-
- String wspPrefix;
-
- String wspWriterPrefix = writer.getPrefix(wspNamespaceURI);
-
- if (wspWriterPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, wspNamespaceURI);
-
- } else {
- wspPrefix = wspWriterPrefix;
- }
-
- // <wsp:Policy>
- writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(), wspNamespaceURI);
-
- if (wspWriterPrefix == null) {
- // xmlns:wsp=".."
- writer.writeNamespace(wspPrefix, wspNamespaceURI);
- }
-
- if (isDerivedKeys()) {
- // <sp:RequireDerivedKeys />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
- }
-
- // </wsp:Policy>
- writer.writeEndElement();
- }
-
- // </sp:SpnegoContextToken>
- writer.writeEndElement();
- }
-
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.ws.security.policy.model;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.ws.security.policy.SP12Constants;
+import org.apache.cxf.ws.security.policy.SPConstants;
+
+/**
+ * Model class for SpnegoContextToken
+ */
+public class SpnegoContextToken extends Token {
+
+ private Element issuerEpr;
+
+ public SpnegoContextToken(SPConstants version) {
+ super(version);
+ }
+
+ public QName getName() {
+ return SP12Constants.INSTANCE.getKerberosToken();
+ }
+
+ /**
+ * @return Returns the issuerEpr.
+ */
+ public Element getIssuerEpr() {
+ return issuerEpr;
+ }
+
+ /**
+ * @param issuerEpr The issuerEpr to set.
+ */
+ public void setIssuerEpr(Element issuerEpr) {
+ this.issuerEpr = issuerEpr;
+ }
+
+
+ public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ QName name = constants.getSpnegoContextToken();
+ String localname = name.getLocalPart();
+ String namespaceURI = name.getNamespaceURI();
+ String prefix;
+
+ String writerPrefix = writer.getPrefix(namespaceURI);
+
+ if (writerPrefix == null) {
+ prefix = name.getPrefix();
+ writer.setPrefix(prefix, namespaceURI);
+ } else {
+ prefix = writerPrefix;
+ }
+
+ // <sp:SpnegoContextToken>
+ writer.writeStartElement(prefix, localname, namespaceURI);
+
+ if (writerPrefix == null) {
+ // xmlns:sp=".."
+ writer.writeNamespace(prefix, namespaceURI);
+ }
+
+ String inclusion;
+
+ inclusion = constants.getAttributeValueFromInclusion(getInclusion());
+
+ if (inclusion != null) {
+ writer.writeAttribute(prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
+ }
+
+ if (issuerEpr != null) {
+ // <sp:Issuer>
+ writer.writeStartElement(prefix, SPConstants.ISSUER, namespaceURI);
+
+ StaxUtils.copy(issuerEpr, writer);
+
+ writer.writeEndElement();
+ }
+
+ if (isDerivedKeys()) {
+
+ String wspNamespaceURI = SPConstants.POLICY.getNamespaceURI();
+
+ String wspPrefix;
+
+ String wspWriterPrefix = writer.getPrefix(wspNamespaceURI);
+
+ if (wspWriterPrefix == null) {
+ wspPrefix = SPConstants.POLICY.getPrefix();
+ writer.setPrefix(wspPrefix, wspNamespaceURI);
+
+ } else {
+ wspPrefix = wspWriterPrefix;
+ }
+
+ // <wsp:Policy>
+ writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(), wspNamespaceURI);
+
+ if (wspWriterPrefix == null) {
+ // xmlns:wsp=".."
+ writer.writeNamespace(wspPrefix, wspNamespaceURI);
+ }
+
+ if (isDerivedKeys()) {
+ // <sp:RequireDerivedKeys />
+ writer.writeEmptyElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
+ }
+
+ // </wsp:Policy>
+ writer.writeEndElement();
+ }
+
+ // </sp:SpnegoContextToken>
+ writer.writeEndElement();
+ }
+
+
+}
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SpnegoContextToken.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/model/binding14.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/model/binding14.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/rt/ws/security/src/main/model/ws-trust-1.4.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/ws/security/src/main/model/ws-trust-1.4.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GreeterImplSoap12.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/Soap12Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/soap12Bus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/soap12Bus.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/KerberosTokenTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/DoubleItImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/server/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java?rev=1164163&r1=1164162&r2=1164163&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java Thu Sep 1 16:51:21 2011
@@ -1,33 +1,33 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.ws.security.handler;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld",
- endpointInterface = "org.apache.cxf.systest.ws.security.handler.HelloWorld")
-public class HelloWorldImpl implements HelloWorld {
- @WebMethod
- public String sayHello(@WebParam(name = "toWhom") String toWhom) {
- return "Hello " + toWhom;
-
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.security.handler;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService(name = "HelloWorld", targetNamespace = "http://cxf.apache.org/wsse/handler/helloworld",
+ endpointInterface = "org.apache.cxf.systest.ws.security.handler.HelloWorld")
+public class HelloWorldImpl implements HelloWorld {
+ @WebMethod
+ public String sayHello(@WebParam(name = "toWhom") String toWhom) {
+ return "Hello " + toWhom;
+
+ }
+}
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/HelloWorldImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/JAXWSHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Encrypt.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Client_Sign.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_Decrypt.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/Server_SignVerf.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/client.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml