cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1173027 [1/2] - in /cxf/trunk/distribution/src/main/release/samples: aegis/ aegis/src/demo/ aegis/src/main/ aegis/src/main/java/ aegis/src/main/java/demo/ aegis/src/test/ aegis/src/test/java/ aegis/src/test/java/org/ aegis/testSrc/ aegis_s...
Date Tue, 20 Sep 2011 08:46:10 GMT
Author: ningjiang
Date: Tue Sep 20 08:46:04 2011
New Revision: 1173027

URL: http://svn.apache.org/viewvc?rev=1173027&view=rev
Log:
CXF-3690 using the maven stander main/java as the java source directory

Added:
    cxf/trunk/distribution/src/main/release/samples/aegis/src/main/
    cxf/trunk/distribution/src/main/release/samples/aegis/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/aegis/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/
    cxf/trunk/distribution/src/main/release/samples/aegis/src/test/
    cxf/trunk/distribution/src/main/release/samples/aegis/src/test/java/
    cxf/trunk/distribution/src/main/release/samples/aegis/src/test/java/org/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/org/
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/src/main/
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/aegis_standalone/src/org/
    cxf/trunk/distribution/src/main/release/samples/callback/src/main/
    cxf/trunk/distribution/src/main/release/samples/callback/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/callback/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/callback/src/demo/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/demo/
    cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/main/
    cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/main/
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/src/main/
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/src/main/
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jaxws_async/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/main/
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/main/
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms_queue/src/main/
    cxf/trunk/distribution/src/main/release/samples/jms_queue/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/jms_queue/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/jms_queue/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_client/src/main/
    cxf/trunk/distribution/src/main/release/samples/js_client/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/js_client/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/js_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/js_provider/src/demo/
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/logbrowser/src/demo/
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/mtom/src/demo/
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/demo/
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/main/
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/
    cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/
    cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/soap_header/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/
    cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/
    cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/src/main/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/src/main/java/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/src/main/java/demo/
      - copied from r1172988, cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/src/demo/
Removed:
    cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/
    cxf/trunk/distribution/src/main/release/samples/aegis/testSrc/
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/src/org/
    cxf/trunk/distribution/src/main/release/samples/callback/src/demo/
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/demo/
    cxf/trunk/distribution/src/main/release/samples/in_jvm_transport/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/src/demo/
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/src/demo/
    cxf/trunk/distribution/src/main/release/samples/jms_queue/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/demo/
    cxf/trunk/distribution/src/main/release/samples/logbrowser/src/demo/
    cxf/trunk/distribution/src/main/release/samples/mtom/src/demo/
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/demo/
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/
    cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_policy/src/demo/
    cxf/trunk/distribution/src/main/release/samples/ws_rm/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/org/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/demo/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xmlbeans/src/demo/
Modified:
    cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
    cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml
    cxf/trunk/distribution/src/main/release/samples/callback/pom.xml
    cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/SecurityExceptionMapper.java
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
    cxf/trunk/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_async/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_handlers/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms_pubsub/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jms_queue/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/logbrowser/pom.xml
    cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
    cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
    cxf/trunk/distribution/src/main/release/samples/restful_http_binding/pom.xml
    cxf/trunk/distribution/src/main/release/samples/soap_header/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_https/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml

Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml Tue Sep 20 08:46:04 2011
@@ -34,13 +34,6 @@
     </properties>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src</directory>
-            </resource>
-        </resources>
-        <sourceDirectory>src</sourceDirectory>
-	<testSourceDirectory>testSrc</testSourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis_standalone/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/callback/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/callback/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/callback/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/callback/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -95,7 +94,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/src/demo/callback/client/callback_infoset.xml" todir="${basedir}/target/classes/demo/callback/client" />
+                                <copy file="${basedir}/src/main/java/demo/callback/client/callback_infoset.xml" todir="${basedir}/target/classes/demo/callback/client" />
                             </tasks>
                         </configuration>
                     </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_pojo/pom.xml Tue Sep 20 08:46:04 2011
@@ -33,7 +33,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/pom.xml Tue Sep 20 08:46:04 2011
@@ -32,7 +32,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -52,7 +51,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/src/demo/spring/client/client-beans.xml" todir="${basedir}/target/classes/demo/spring/client" />
+                                <copy file="${basedir}/src/main/java/demo/spring/client/client-beans.xml" todir="${basedir}/target/classes/demo/spring/client" />
                             </tasks>
                         </configuration>
                     </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/pom.xml Tue Sep 20 08:46:04 2011
@@ -34,7 +34,6 @@
         <httpclient.version>3.1</httpclient.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -54,8 +53,8 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
-                                <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
+                                <copy file="${basedir}/src/main/java/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
+                                <copy file="${basedir}/src/main/java/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
                             </tasks>
                         </configuration>
                     </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Tue Sep 20 08:46:04 2011
@@ -35,7 +35,6 @@
     </properties>
 
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml Tue Sep 20 08:46:04 2011
@@ -34,7 +34,6 @@
         <httpclient.version>3.1</httpclient.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml?rev=1173027&r1=1173026&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml Tue Sep 20 08:46:04 2011
@@ -35,7 +35,6 @@
         <aspectj.version>1.5.4</aspectj.version>
     </properties>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -55,8 +54,8 @@
 	    	        </goals>
 	    	        <configuration>
 	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
+	    	               <copy file="${basedir}/src/main/java/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
+	    	               <copy file="${basedir}/src/main/java/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client" />
 	    	            </tasks>
 	    	        </configuration>
 	    	    </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java Tue Sep 20 08:46:04 2011
@@ -1,158 +1,158 @@
-/**
- * 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 demo.jaxrs.client;
-
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-
-import org.apache.cxf.common.util.Base64Utility;
-
-public final class Client {
-
-    private Client() {
-    }
-
-    public static void main(String args[]) throws Exception {
-
-        System.out.println("\n");
-        Client c = new Client();
-                
-        // 1. get customer info  
-        // 
-        c.getCustomerInfo("fred", "fred", 123);
-        c.getCustomerInfo("fred", "fredspassword", 123);
-        c.getCustomerInfo("bob", "bobspassword", 123);
-
-        // 2. add customer info  
-        // 
-        c.addCustomerInfo("fred", "fredspassword");
-        c.addCustomerInfo("bob", "bobspassword");
-         
-        // 3. update customer info  
-        // 
-        c.updateCustomerInfo("fred", "fredspassword");
-        c.updateCustomerInfo("bob", "bobspassword");
-
-        // 4. delete customer info  
-        // 
-        c.deleteCustomerInfo("bob", "bobspassword", 123);
-        c.deleteCustomerInfo("fred", "fredspassword", 123);
-        
-
-    }
-
-    public void getCustomerInfo(String name, String password, int id) throws Exception {
-               
-        System.out.println("HTTP GET to query customer info, user : " 
-            + name + ", password : " + password);
-        GetMethod get = 
-            new GetMethod("http://localhost:9002/customerservice/customers/" + id);
-        setMethodHeaders(get, name, password);
-        handleHttpMethod(get);
-    } 
-
-    public void addCustomerInfo(String name, String password) throws Exception {
-               
-        System.out.println("HTTP POST to add customer info, user : " 
-            + name + ", password : " + password);
-        PostMethod post = new PostMethod("http://localhost:9002/customerservice/customers");
-        setMethodHeaders(post, name, password);
-        RequestEntity entity = new InputStreamRequestEntity(
-            this.getClass().getResourceAsStream("add_customer.xml"));
-        post.setRequestEntity(entity);
-        
-        handleHttpMethod(post);
-    } 
-
-    public void updateCustomerInfo(String name, String password) throws Exception {
-               
-        System.out.println("HTTP PUT to update customer info, user : " 
-            + name + ", password : " + password);
-        PutMethod put = new PutMethod("http://localhost:9002/customerservice/customers/123");
-        setMethodHeaders(put, name, password);
-        RequestEntity entity = new InputStreamRequestEntity(
-            this.getClass().getResourceAsStream("update_customer.xml"));
-        put.setRequestEntity(entity);
-        
-        handleHttpMethod(put);
-    } 
-
-    public void deleteCustomerInfo(String name, String password, int id) throws Exception {
-               
-        System.out.println("HTTP DELETE to update customer info, user : " 
-            + name + ", password : " + password);
-        System.out.println("Confirming a customer with id " + id + " exists first");
-        getCustomerInfo(name, password, id);
-        System.out.println("Deleting now...");
-        DeleteMethod del = 
-            new DeleteMethod("http://localhost:9002/customerservice/customers/" + id);
-        setMethodHeaders(del, name, password);
-        handleHttpMethod(del);
-        System.out.println("Confirming a customer with id " + id + " does not exist anymore");
-        getCustomerInfo(name, password, id);
-    }  
-
-    private static void handleHttpMethod(HttpMethod httpMethod) throws Exception {
-        HttpClient client = new HttpClient();
-
-        try {
-            int statusCode = client.executeMethod(httpMethod);
-            System.out.println("Response status : " + statusCode); 
-
-            Response.Status status =  Response.Status.fromStatusCode(statusCode);
-
-            if (status == Response.Status.OK) {
-                System.out.println(httpMethod.getResponseBodyAsString());    
-            } else if (status == Response.Status.FORBIDDEN) {
-                System.out.println("Authorization failure");
-            } else if (status == Response.Status.UNAUTHORIZED) {
-                System.out.println("Authentication failure");
-            }
-            System.out.println(); 
-
-        } finally {
-            // release any connection resources used by the method
-            httpMethod.releaseConnection();
-        }  
-    }
-
-    private static void setMethodHeaders(HttpMethod httpMethod, String name, String password) {
-        if (httpMethod instanceof PostMethod || httpMethod instanceof PutMethod) {
-            httpMethod.setRequestHeader("Content-Type", "application/xml");
-        }         
-        httpMethod.setDoAuthentication(false);
-        httpMethod.setRequestHeader("Accept", "application/xml");
-        httpMethod.setRequestHeader("Authorization", 
-                             "Basic " + base64Encode(name + ":" + password));
-          
-    }
-
-    private static String base64Encode(String value) {
-        return Base64Utility.encode(value.getBytes());
-    }
-}
+/**
+ * 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 demo.jaxrs.client;
+
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+
+import org.apache.cxf.common.util.Base64Utility;
+
+public final class Client {
+
+    private Client() {
+    }
+
+    public static void main(String args[]) throws Exception {
+
+        System.out.println("\n");
+        Client c = new Client();
+                
+        // 1. get customer info  
+        // 
+        c.getCustomerInfo("fred", "fred", 123);
+        c.getCustomerInfo("fred", "fredspassword", 123);
+        c.getCustomerInfo("bob", "bobspassword", 123);
+
+        // 2. add customer info  
+        // 
+        c.addCustomerInfo("fred", "fredspassword");
+        c.addCustomerInfo("bob", "bobspassword");
+         
+        // 3. update customer info  
+        // 
+        c.updateCustomerInfo("fred", "fredspassword");
+        c.updateCustomerInfo("bob", "bobspassword");
+
+        // 4. delete customer info  
+        // 
+        c.deleteCustomerInfo("bob", "bobspassword", 123);
+        c.deleteCustomerInfo("fred", "fredspassword", 123);
+        
+
+    }
+
+    public void getCustomerInfo(String name, String password, int id) throws Exception {
+               
+        System.out.println("HTTP GET to query customer info, user : " 
+            + name + ", password : " + password);
+        GetMethod get = 
+            new GetMethod("http://localhost:9002/customerservice/customers/" + id);
+        setMethodHeaders(get, name, password);
+        handleHttpMethod(get);
+    } 
+
+    public void addCustomerInfo(String name, String password) throws Exception {
+               
+        System.out.println("HTTP POST to add customer info, user : " 
+            + name + ", password : " + password);
+        PostMethod post = new PostMethod("http://localhost:9002/customerservice/customers");
+        setMethodHeaders(post, name, password);
+        RequestEntity entity = new InputStreamRequestEntity(
+            this.getClass().getResourceAsStream("add_customer.xml"));
+        post.setRequestEntity(entity);
+        
+        handleHttpMethod(post);
+    } 
+
+    public void updateCustomerInfo(String name, String password) throws Exception {
+               
+        System.out.println("HTTP PUT to update customer info, user : " 
+            + name + ", password : " + password);
+        PutMethod put = new PutMethod("http://localhost:9002/customerservice/customers/123");
+        setMethodHeaders(put, name, password);
+        RequestEntity entity = new InputStreamRequestEntity(
+            this.getClass().getResourceAsStream("update_customer.xml"));
+        put.setRequestEntity(entity);
+        
+        handleHttpMethod(put);
+    } 
+
+    public void deleteCustomerInfo(String name, String password, int id) throws Exception {
+               
+        System.out.println("HTTP DELETE to update customer info, user : " 
+            + name + ", password : " + password);
+        System.out.println("Confirming a customer with id " + id + " exists first");
+        getCustomerInfo(name, password, id);
+        System.out.println("Deleting now...");
+        DeleteMethod del = 
+            new DeleteMethod("http://localhost:9002/customerservice/customers/" + id);
+        setMethodHeaders(del, name, password);
+        handleHttpMethod(del);
+        System.out.println("Confirming a customer with id " + id + " does not exist anymore");
+        getCustomerInfo(name, password, id);
+    }  
+
+    private static void handleHttpMethod(HttpMethod httpMethod) throws Exception {
+        HttpClient client = new HttpClient();
+
+        try {
+            int statusCode = client.executeMethod(httpMethod);
+            System.out.println("Response status : " + statusCode); 
+
+            Response.Status status =  Response.Status.fromStatusCode(statusCode);
+
+            if (status == Response.Status.OK) {
+                System.out.println(httpMethod.getResponseBodyAsString());    
+            } else if (status == Response.Status.FORBIDDEN) {
+                System.out.println("Authorization failure");
+            } else if (status == Response.Status.UNAUTHORIZED) {
+                System.out.println("Authentication failure");
+            }
+            System.out.println(); 
+
+        } finally {
+            // release any connection resources used by the method
+            httpMethod.releaseConnection();
+        }  
+    }
+
+    private static void setMethodHeaders(HttpMethod httpMethod, String name, String password) {
+        if (httpMethod instanceof PostMethod || httpMethod instanceof PutMethod) {
+            httpMethod.setRequestHeader("Content-Type", "application/xml");
+        }         
+        httpMethod.setDoAuthentication(false);
+        httpMethod.setRequestHeader("Accept", "application/xml");
+        httpMethod.setRequestHeader("Authorization", 
+                             "Basic " + base64Encode(name + ":" + password));
+          
+    }
+
+    private static String base64Encode(String value) {
+        return Base64Utility.encode(value.getBytes());
+    }
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml Tue Sep 20 08:46:04 2011
@@ -1,3 +1,3 @@
-<Customer>
-  <name>Jack</name>
+<Customer>
+  <name>Jack</name>
 </Customer> 
\ No newline at end of file

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml Tue Sep 20 08:46:04 2011
@@ -1,4 +1,4 @@
-<Customer>
-  <name>Mary</name>
-  <id>123</id>
+<Customer>
+  <name>Mary</name>
+  <id>123</id>
 </Customer> 
\ No newline at end of file

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java Tue Sep 20 08:46:04 2011
@@ -1,74 +1,74 @@
-/**
- * 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 demo.jaxrs.service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-@Path("/customerservice/")
-public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
-    
-    protected long currentId = 123;
-    protected Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    protected Map<Long, Order> orders = new HashMap<Long, Order>();
-
-    protected AbstractCustomerServiceSecured() {
-        init();
-    } 
-
-    @GET
-    @Path("/customers/{id}/")
-    public abstract Customer getCustomer(@PathParam("id") String id);
-
-    @PUT
-    @Path("/customers/{id}")
-    public abstract Response updateCustomer(@PathParam("id") Long id, Customer customer);
-    
-    @POST
-    @Path("/customers/")
-    public abstract Response addCustomer(Customer customer);
-
-    @DELETE
-    @Path("/customers/{id}/")
-    public abstract Response deleteCustomer(@PathParam("id") String id);
-
-    @Path("/orders/{orderId}/")
-    public abstract Order getOrder(@PathParam("orderId") String orderId);
-
-    private void init() {
-        Customer c = new Customer();
-        c.setName("John");
-        c.setId(123);
-        customers.put(c.getId(), c);
-
-        Order o = new Order();
-        o.setDescription("order 223");
-        o.setId(223);
-        orders.put(o.getId(), o);
-    }
-
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+@Path("/customerservice/")
+public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
+    
+    protected long currentId = 123;
+    protected Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    protected Map<Long, Order> orders = new HashMap<Long, Order>();
+
+    protected AbstractCustomerServiceSecured() {
+        init();
+    } 
+
+    @GET
+    @Path("/customers/{id}/")
+    public abstract Customer getCustomer(@PathParam("id") String id);
+
+    @PUT
+    @Path("/customers/{id}")
+    public abstract Response updateCustomer(@PathParam("id") Long id, Customer customer);
+    
+    @POST
+    @Path("/customers/")
+    public abstract Response addCustomer(Customer customer);
+
+    @DELETE
+    @Path("/customers/{id}/")
+    public abstract Response deleteCustomer(@PathParam("id") String id);
+
+    @Path("/orders/{orderId}/")
+    public abstract Order getOrder(@PathParam("orderId") String orderId);
+
+    private void init() {
+        Customer c = new Customer();
+        c.setName("John");
+        c.setId(123);
+        customers.put(c.getId(), c);
+
+        Order o = new Order();
+        o.setDescription("order 223");
+        o.setId(223);
+        orders.put(o.getId(), o);
+    }
+
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Customer.java Tue Sep 20 08:46:04 2011
@@ -1,43 +1,43 @@
-/**
- * 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 demo.jaxrs.service;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Customer")
-public class Customer {
-    private long id;
-    private String name;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "Customer")
+public class Customer {
+    private long id;
+    private String name;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java Tue Sep 20 08:46:04 2011
@@ -1,51 +1,51 @@
-/**
- * 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 demo.jaxrs.service;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-@Path("/customerservice/")
-public interface CustomerService {
-    
-    @GET
-    @Path("/customers/{id}/")
-    Customer getCustomer(@PathParam("id") String id);
-
-    @PUT
-    @Path("/customers/{id}")
-    Response updateCustomer(@PathParam("id") Long id, Customer customer);
-    
-    @POST
-    @Path("/customers/")
-    Response addCustomer(Customer customer);
-
-    @DELETE
-    @Path("/customers/{id}/")
-    Response deleteCustomer(@PathParam("id") String id);
-
-    @Path("/orders/{orderId}/")
-    Order getOrder(@PathParam("orderId") String orderId);
-
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+@Path("/customerservice/")
+public interface CustomerService {
+    
+    @GET
+    @Path("/customers/{id}/")
+    Customer getCustomer(@PathParam("id") String id);
+
+    @PUT
+    @Path("/customers/{id}")
+    Response updateCustomer(@PathParam("id") Long id, Customer customer);
+    
+    @POST
+    @Path("/customers/")
+    Response addCustomer(Customer customer);
+
+    @DELETE
+    @Path("/customers/{id}/")
+    Response deleteCustomer(@PathParam("id") String id);
+
+    @Path("/orders/{orderId}/")
+    Order getOrder(@PathParam("orderId") String orderId);
+
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java Tue Sep 20 08:46:04 2011
@@ -1,103 +1,103 @@
-/**
- * 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 demo.jaxrs.service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-
-public class CustomerServiceImpl implements CustomerService {
-    long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
-
-    public CustomerServiceImpl() {
-        init();
-    }
-
-    public Customer getCustomer(String id) {
-        System.out.println("----invoking getCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.get(idNumber);
-        return c;
-    }
-
-    public Response updateCustomer(Long id, Customer customer) {
-        System.out.println("----invoking updateCustomer, Customer name is: " + customer.getName());
-        Customer c = customers.get(id);
-        if (c == null || c.getId() != customer.getId()) {
-            throw new WebApplicationException();
-        }
-        Response r;
-        if (c != null) {
-            customers.put(customer.getId(), customer);
-            r = Response.ok(customer).build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    public Response addCustomer(Customer customer) {
-        System.out.println("----invoking addCustomer, Customer name is: " + customer.getName());
-        customer.setId(++currentId);
-
-        customers.put(customer.getId(), customer);
-
-        return Response.ok(customer).build();
-    }
-
-    public Response deleteCustomer(String id) {
-        System.out.println("----invoking deleteCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.remove(idNumber);
-
-        Response r;
-        if (c != null) {
-            r = Response.ok().build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    public Order getOrder(String orderId) {
-        System.out.println("----invoking getOrder, Order id is: " + orderId);
-        long idNumber = Long.parseLong(orderId);
-        Order c = orders.get(idNumber);
-        return c;
-    }
-
-    final void init() {
-        Customer c = new Customer();
-        c.setName("John");
-        c.setId(123);
-        customers.put(c.getId(), c);
-
-        Order o = new Order();
-        o.setDescription("order 223");
-        o.setId(223);
-        orders.put(o.getId(), o);
-    }
-
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+public class CustomerServiceImpl implements CustomerService {
+    long currentId = 123;
+    Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    Map<Long, Order> orders = new HashMap<Long, Order>();
+
+    public CustomerServiceImpl() {
+        init();
+    }
+
+    public Customer getCustomer(String id) {
+        System.out.println("----invoking getCustomer, Customer id is: " + id);
+        long idNumber = Long.parseLong(id);
+        Customer c = customers.get(idNumber);
+        return c;
+    }
+
+    public Response updateCustomer(Long id, Customer customer) {
+        System.out.println("----invoking updateCustomer, Customer name is: " + customer.getName());
+        Customer c = customers.get(id);
+        if (c == null || c.getId() != customer.getId()) {
+            throw new WebApplicationException();
+        }
+        Response r;
+        if (c != null) {
+            customers.put(customer.getId(), customer);
+            r = Response.ok(customer).build();
+        } else {
+            r = Response.notModified().build();
+        }
+
+        return r;
+    }
+
+    public Response addCustomer(Customer customer) {
+        System.out.println("----invoking addCustomer, Customer name is: " + customer.getName());
+        customer.setId(++currentId);
+
+        customers.put(customer.getId(), customer);
+
+        return Response.ok(customer).build();
+    }
+
+    public Response deleteCustomer(String id) {
+        System.out.println("----invoking deleteCustomer, Customer id is: " + id);
+        long idNumber = Long.parseLong(id);
+        Customer c = customers.remove(idNumber);
+
+        Response r;
+        if (c != null) {
+            r = Response.ok().build();
+        } else {
+            r = Response.notModified().build();
+        }
+
+        return r;
+    }
+
+    public Order getOrder(String orderId) {
+        System.out.println("----invoking getOrder, Order id is: " + orderId);
+        long idNumber = Long.parseLong(orderId);
+        Order c = orders.get(idNumber);
+        return c;
+    }
+
+    final void init() {
+        Customer c = new Customer();
+        c.setName("John");
+        c.setId(123);
+        customers.put(c.getId(), c);
+
+        Order o = new Order();
+        o.setDescription("order 223");
+        o.setId(223);
+        orders.put(o.getId(), o);
+    }
+
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java Tue Sep 20 08:46:04 2011
@@ -1,42 +1,42 @@
-/**
- * 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 demo.jaxrs.service;
-
-import javax.ws.rs.core.Response;
-import org.springframework.security.annotation.Secured;
-
-
-public interface CustomerServiceSecured {
-    
-    @Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
-    Customer getCustomer(String id);
-
-    @Secured("ROLE_ADMIN")
-    Response updateCustomer(Long id, Customer customer);
-    
-    @Secured("ROLE_ADMIN")
-    Response addCustomer(Customer customer);
-
-    @Secured("ROLE_ADMIN")
-    Response deleteCustomer(String id);
-
-    @Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
-    Order getOrder(String orderId);
-
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import javax.ws.rs.core.Response;
+import org.springframework.security.annotation.Secured;
+
+
+public interface CustomerServiceSecured {
+    
+    @Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
+    Customer getCustomer(String id);
+
+    @Secured("ROLE_ADMIN")
+    Response updateCustomer(Long id, Customer customer);
+    
+    @Secured("ROLE_ADMIN")
+    Response addCustomer(Customer customer);
+
+    @Secured("ROLE_ADMIN")
+    Response deleteCustomer(String id);
+
+    @Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
+    Order getOrder(String orderId);
+
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java Tue Sep 20 08:46:04 2011
@@ -1,87 +1,87 @@
-/**
- * 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 demo.jaxrs.service;
-
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
-
-public class CustomerServiceSecuredImpl extends AbstractCustomerServiceSecured {
-
-    public CustomerServiceSecuredImpl() {
-    }
-
-    public Customer getCustomer(String id) {
-        System.out.println("----invoking getCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.get(idNumber);
-        return c;
-    }
-
-    public Response updateCustomer(Long id, Customer customer) {
-        System.out.println("----invoking updateCustomer, Customer name is: " + customer.getName());
-        Customer c = customers.get(id);
-        if (c == null || c.getId() != customer.getId()) {
-            throw new WebApplicationException();
-        }
-        Response r;
-        if (c != null) {
-            customers.put(customer.getId(), customer);
-            r = Response.ok(customer).build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    public Response addCustomer(Customer customer) {
-        System.out.println("----invoking addCustomer, Customer name is: " + customer.getName());
-        customer.setId(++currentId);
-
-        customers.put(customer.getId(), customer);
-
-        return Response.ok(customer).build();
-    }
-
-    public Response deleteCustomer(String id) {
-        System.out.println("----invoking deleteCustomer, Customer id is: " + id);
-        long idNumber = Long.parseLong(id);
-        Customer c = customers.remove(idNumber);
-
-        Response r;
-        if (c != null) {
-            r = Response.ok().build();
-        } else {
-            r = Response.notModified().build();
-        }
-
-        return r;
-    }
-
-    public Order getOrder(String orderId) {
-        System.out.println("----invoking getOrder, Order id is: " + orderId);
-        long idNumber = Long.parseLong(orderId);
-        Order c = orders.get(idNumber);
-        return c;
-    }
-
-    
-
-}
+/**
+ * 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 demo.jaxrs.service;
+
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+public class CustomerServiceSecuredImpl extends AbstractCustomerServiceSecured {
+
+    public CustomerServiceSecuredImpl() {
+    }
+
+    public Customer getCustomer(String id) {
+        System.out.println("----invoking getCustomer, Customer id is: " + id);
+        long idNumber = Long.parseLong(id);
+        Customer c = customers.get(idNumber);
+        return c;
+    }
+
+    public Response updateCustomer(Long id, Customer customer) {
+        System.out.println("----invoking updateCustomer, Customer name is: " + customer.getName());
+        Customer c = customers.get(id);
+        if (c == null || c.getId() != customer.getId()) {
+            throw new WebApplicationException();
+        }
+        Response r;
+        if (c != null) {
+            customers.put(customer.getId(), customer);
+            r = Response.ok(customer).build();
+        } else {
+            r = Response.notModified().build();
+        }
+
+        return r;
+    }
+
+    public Response addCustomer(Customer customer) {
+        System.out.println("----invoking addCustomer, Customer name is: " + customer.getName());
+        customer.setId(++currentId);
+
+        customers.put(customer.getId(), customer);
+
+        return Response.ok(customer).build();
+    }
+
+    public Response deleteCustomer(String id) {
+        System.out.println("----invoking deleteCustomer, Customer id is: " + id);
+        long idNumber = Long.parseLong(id);
+        Customer c = customers.remove(idNumber);
+
+        Response r;
+        if (c != null) {
+            r = Response.ok().build();
+        } else {
+            r = Response.notModified().build();
+        }
+
+        return r;
+    }
+
+    public Order getOrder(String orderId) {
+        System.out.println("----invoking getOrder, Order id is: " + orderId);
+        long idNumber = Long.parseLong(orderId);
+        Order c = orders.get(idNumber);
+        return c;
+    }
+
+    
+
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java Tue Sep 20 08:46:04 2011
@@ -1,69 +1,69 @@
-/**
- * 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 demo.jaxrs.service;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Order")
-public class Order {
-    private long id;
-    private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
-
-    public Order() {
-        init();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String d) {
-        this.description = d;
-    }
-
-    @GET
-    @Path("products/{productId}/")
-    public Product getProduct(@PathParam("productId")int productId) {
-        System.out.println("----invoking getProduct with id: " + productId);
-        Product p = products.get(new Long(productId));
-        return p;
-    }
-
-    final void init() {
-        Product p = new Product();
-        p.setId(323);
-        p.setDescription("product 323");
-        products.put(p.getId(), p);
-    }
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "Order")
+public class Order {
+    private long id;
+    private String description;
+    private Map<Long, Product> products = new HashMap<Long, Product>();
+
+    public Order() {
+        init();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String d) {
+        this.description = d;
+    }
+
+    @GET
+    @Path("products/{productId}/")
+    public Product getProduct(@PathParam("productId")int productId) {
+        System.out.println("----invoking getProduct with id: " + productId);
+        Product p = products.get(new Long(productId));
+        return p;
+    }
+
+    final void init() {
+        Product p = new Product();
+        p.setId(323);
+        p.setDescription("product 323");
+        products.put(p.getId(), p);
+    }
+}

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java?rev=1173027&r1=1172988&r2=1173027&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Product.java Tue Sep 20 08:46:04 2011
@@ -1,43 +1,43 @@
-/**
- * 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 demo.jaxrs.service;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "Product")
-public class Product {
-    private long id;
-    private String description;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String d) {
-        this.description = d;
-    }
-}
+/**
+ * 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 demo.jaxrs.service;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "Product")
+public class Product {
+    private long id;
+    private String description;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String d) {
+        this.description = d;
+    }
+}



Mime
View raw message