cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Fri, 18 Jul 2014 16:18:12 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1244e19
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1244e19
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1244e19

Branch: refs/heads/master
Commit: d1244e191ac6f208677b062a77eb3b22fd17f22a
Parents: 2d48a26 5383620
Author: Alessio Soldano <asoldano@redhat.com>
Authored: Fri Jul 18 18:17:23 2014 +0200
Committer: Alessio Soldano <asoldano@redhat.com>
Committed: Fri Jul 18 18:17:23 2014 +0200

----------------------------------------------------------------------
 core/pom.xml                                    |   2 +-
 .../service/factory/FactoryBeanListener.java    |  10 +
 .../cxf/staxutils/CachingXmlEventWriter.java    |   4 +-
 distribution/javadoc/pom.xml                    |   2 +-
 distribution/manifest/pom.xml                   |   2 +-
 distribution/pom.xml                            |   2 +-
 distribution/src/main/release/release_notes.txt |   8 +-
 .../src/main/release/samples/aegis/pom.xml      |  10 +-
 .../release/samples/aegis_standalone/pom.xml    |   4 +-
 .../src/main/release/samples/callback/pom.xml   |   8 +-
 .../samples/configuration_interceptor/pom.xml   |  10 +-
 .../src/main/release/samples/corba/bank/pom.xml |   8 +-
 .../samples/corba/bank_ws_addressing/pom.xml    |   8 +-
 .../release/samples/corba/hello_world/pom.xml   |   8 +-
 .../samples/groovy_spring_support/pom.xml       |   8 +-
 .../release/samples/in_jvm_transport/pom.xml    |  10 +-
 .../release/samples/java_first_jaxws/pom.xml    |   6 +-
 .../java_first_jaxws_factory_bean/pom.xml       |   8 +-
 .../main/release/samples/java_first_jms/pom.xml |   6 +-
 .../release/samples/java_first_pojo/pom.xml     |   8 +-
 .../samples/java_first_spring_support/pom.xml   |   8 +-
 .../main/release/samples/jax_rs/basic/pom.xml   |   8 +-
 .../release/samples/jax_rs/basic_https/pom.xml  |   2 +-
 .../samples/jax_rs/content_negotiation/pom.xml  |  10 +-
 .../release/samples/jax_rs/minimal_osgi/pom.xml |   2 +-
 .../samples/jax_rs/spring_security/pom.xml      |   8 +-
 .../release/samples/jax_rs/websocket/pom.xml    |   8 +-
 .../samples/jax_server_aegis_client/pom.xml     |  10 +-
 .../main/release/samples/jaxws_async/pom.xml    |  10 +-
 .../samples/jaxws_dispatch_provider/pom.xml     |   8 +-
 .../main/release/samples/jaxws_handlers/pom.xml |   8 +-
 .../src/main/release/samples/jms_pubsub/pom.xml |   8 +-
 .../src/main/release/samples/jms_queue/pom.xml  |   6 +-
 .../main/release/samples/jms_spec_demo/pom.xml  |   6 +-
 .../release/samples/jms_spring_config/pom.xml   |   6 +-
 .../js_browser_client_java_first/pom.xml        |  10 +-
 .../samples/js_browser_client_simple/pom.xml    |  10 +-
 .../src/main/release/samples/js_client/pom.xml  |  10 +-
 .../main/release/samples/js_provider/pom.xml    |   8 +-
 .../src/main/release/samples/logbrowser/pom.xml |   2 +-
 .../src/main/release/samples/mtom/pom.xml       |   8 +-
 .../main/release/samples/oauth/client/pom.xml   |   2 +-
 .../main/release/samples/oauth/server/pom.xml   |   2 +-
 distribution/src/main/release/samples/pom.xml   |   2 +-
 .../release/samples/restful_dispatch/pom.xml    |  10 +-
 .../release/samples/ruby_spring_support/pom.xml |   8 +-
 .../main/release/samples/soap_header/pom.xml    |   8 +-
 .../src/main/release/samples/sts/pom.xml        |   2 +-
 .../main/release/samples/ws_addressing/pom.xml  |   8 +-
 .../main/release/samples/ws_discovery/pom.xml   |  10 +-
 .../main/release/samples/ws_eventing/pom.xml    |   2 +-
 .../release/samples/ws_notification/pom.xml     |  14 +-
 .../src/main/release/samples/ws_policy/pom.xml  |   8 +-
 .../src/main/release/samples/ws_rm/pom.xml      |  10 +-
 .../samples/ws_security/sign_enc/pom.xml        |  16 +-
 .../main/release/samples/ws_security/ut/pom.xml |  10 +-
 .../samples/ws_security/ut_policy/pom.xml       |   2 +-
 .../src/main/release/samples/wsdl_first/pom.xml |   6 +-
 .../samples/wsdl_first_dynamic_client/pom.xml   |   8 +-
 .../release/samples/wsdl_first_https/pom.xml    |   2 +-
 .../release/samples/wsdl_first_pure_xml/pom.xml |   8 +-
 .../release/samples/wsdl_first_rpclit/pom.xml   |   8 +-
 .../release/samples/wsdl_first_soap12/pom.xml   |   8 +-
 .../samples/wsdl_first_xml_wrapped/pom.xml      |   8 +-
 .../release/samples/wsdl_first_xmlbeans/pom.xml |  10 +-
 integration/cdi/pom.xml                         |   2 +-
 integration/jca/pom.xml                         |   2 +-
 integration/pom.xml                             |   2 +-
 .../archetypes/cxf-jaxrs-service/pom.xml        |   2 +-
 .../archetypes/cxf-jaxws-javafirst/pom.xml      |   4 +-
 maven-plugins/archetypes/pom.xml                |   2 +-
 maven-plugins/codegen-plugin/pom.xml            |   2 +-
 maven-plugins/corba/pom.xml                     |   2 +-
 maven-plugins/java2wadl-plugin/pom.xml          |   4 +-
 maven-plugins/java2ws-plugin/pom.xml            |   2 +-
 maven-plugins/pom.xml                           |   2 +-
 maven-plugins/wadl2java-plugin/pom.xml          |   2 +-
 maven-plugins/wsdl-validator-plugin/pom.xml     |   2 +-
 osgi/bundle/compatible/pom.xml                  |   2 +-
 osgi/bundle/pom.xml                             |   2 +-
 osgi/itests-felix/pom.xml                       |   2 +-
 osgi/itests/pom.xml                             |   2 +-
 osgi/karaf/commands/pom.xml                     |   2 +-
 osgi/karaf/features/pom.xml                     |   2 +-
 osgi/karaf/pom.xml                              |   2 +-
 osgi/pom.xml                                    |   2 +-
 parent/pom.xml                                  |   8 +-
 pom.xml                                         |   2 +-
 rt/bindings/coloc/pom.xml                       |   2 +-
 rt/bindings/corba/pom.xml                       |   2 +-
 rt/bindings/object/pom.xml                      |   2 +-
 rt/bindings/pom.xml                             |   2 +-
 rt/bindings/soap/pom.xml                        |   2 +-
 rt/bindings/xml/pom.xml                         |   2 +-
 rt/databinding/aegis/pom.xml                    |   2 +-
 rt/databinding/jaxb/pom.xml                     |   2 +-
 rt/databinding/jibx/pom.xml                     |   2 +-
 rt/databinding/sdo/pom.xml                      |   2 +-
 rt/databinding/xmlbeans/pom.xml                 |   2 +-
 rt/features/clustering/pom.xml                  |   2 +-
 rt/frontend/jaxrs/pom.xml                       |   2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBean.java       |   4 +
 .../jaxrs/provider/AbstractJAXBProvider.java    |  12 +-
 rt/frontend/jaxws/pom.xml                       |   2 +-
 rt/frontend/js/pom.xml                          |   2 +-
 rt/frontend/simple/pom.xml                      |   2 +-
 .../apache/cxf/frontend/ClientFactoryBean.java  |   1 +
 .../apache/cxf/frontend/ServerFactoryBean.java  |  10 +
 rt/javascript/javascript-rt/pom.xml             |   2 +-
 rt/javascript/javascript-tests/pom.xml          |   2 +-
 rt/javascript/pom.xml                           |   2 +-
 rt/management-web/pom.xml                       |   2 +-
 rt/management/pom.xml                           |   2 +-
 .../counters/ResponseTimeCounter.java           | 126 ++++++++-----
 .../counters/CounterRepositoryTest.java         |   4 +-
 rt/pom.xml                                      |   2 +-
 rt/rs/client/pom.xml                            |   2 +-
 .../jaxrs/client/JAXRSClientFactoryBean.java    |   1 +
 rt/rs/description/pom.xml                       |   2 +-
 rt/rs/extensions/providers/pom.xml              |   2 +-
 rt/rs/extensions/search/pom.xml                 |   2 +-
 .../search/DefaultParamConverterProvider.java   |   2 +-
 .../cxf/jaxrs/ext/search/QueryContext.java      |  27 +++
 .../jaxrs/ext/search/QueryContextProvider.java  |  17 ++
 rt/rs/security/cors/pom.xml                     |   2 +-
 rt/rs/security/oauth-parent/oauth/pom.xml       |   2 +-
 rt/rs/security/oauth-parent/oauth2-jwt/pom.xml  |   2 +-
 .../oauth2/jwe/AbstractJweDecryption.java       |  93 ++++++++++
 .../oauth2/jwe/AbstractJweDecryptor.java        |  89 ---------
 .../oauth2/jwe/AbstractJweEncryption.java       | 169 +++++++++++++++++
 .../oauth2/jwe/AbstractJweEncryptor.java        | 184 -------------------
 .../oauth2/jwe/ContentEncryptionProvider.java   |  29 ---
 .../oauth2/jwe/DirectKeyJweDecryption.java      |  46 +++++
 .../oauth2/jwe/DirectKeyJweDecryptor.java       |  40 ----
 .../oauth2/jwe/DirectKeyJweEncryption.java      |  39 ++++
 .../oauth2/jwe/DirectKeyJweEncryptor.java       |  39 ----
 .../security/oauth2/jwe/JweCompactConsumer.java |  41 +----
 .../rs/security/oauth2/jwe/JweDecryption.java   |  26 +++
 .../rs/security/oauth2/jwe/JweDecryptor.java    |  24 ---
 .../rs/security/oauth2/jwe/JweEncryption.java   |  60 ++++++
 .../oauth2/jwe/JweEncryptionProvider.java       |  26 +++
 .../rs/security/oauth2/jwe/JweEncryptor.java    |  27 ---
 .../security/oauth2/jwe/RSAJweDecryption.java   |  40 ++++
 .../rs/security/oauth2/jwe/RSAJweDecryptor.java |  40 ----
 .../security/oauth2/jwe/RSAJweEncryption.java   |  62 +++++++
 .../rs/security/oauth2/jwe/RSAJweEncryptor.java |  62 -------
 .../oauth2/jwe/WrappedKeyJweDecryption.java     |  72 ++++++++
 .../oauth2/jwe/WrappedKeyJweDecryptor.java      |  67 -------
 .../oauth2/jwe/WrappedKeyJweEncryption.java     |  77 ++++++++
 .../oauth2/jwe/WrappedKeyJweEncryptor.java      |  77 --------
 .../jws/AbstractJwsSignatureProvider.java       |  26 +--
 .../oauth2/jws/HmacJwsSignatureProvider.java    |  12 +-
 .../security/oauth2/jws/JwsCompactProducer.java |  12 +-
 .../rs/security/oauth2/jws/JwsOutputStream.java |   4 +-
 .../rs/security/oauth2/jws/JwsSignature.java    |  25 +++
 .../oauth2/jws/JwsSignatureProvider.java        |   6 +-
 .../oauth2/jws/JwsSignatureProviderWorker.java  |  25 ---
 .../jws/PrivateKeyJwsSignatureProvider.java     |  19 +-
 .../jwt/jaxrs/AbstractJweDecryptingFilter.java  |  20 +-
 .../oauth2/jwt/jaxrs/JweWriterInterceptor.java  |  50 ++++-
 .../oauth2/jwt/jaxrs/JwsWriterInterceptor.java  |  19 +-
 .../oauth2/jwe/JweCompactReaderWriterTest.java  |   8 +-
 rt/rs/security/oauth-parent/oauth2-saml/pom.xml |   2 +-
 rt/rs/security/oauth-parent/oauth2/pom.xml      |   2 +-
 .../oauth2/provider/OAuthJSONProvider.java      |   3 +-
 rt/rs/security/oauth-parent/pom.xml             |   2 +-
 rt/rs/security/sso/saml/pom.xml                 |   2 +-
 rt/rs/security/xml/pom.xml                      |   2 +-
 rt/security/pom.xml                             |   2 +-
 rt/transports/http-hc/pom.xml                   |   2 +-
 rt/transports/http-jetty/pom.xml                |   2 +-
 rt/transports/http-netty/netty-client/pom.xml   |   2 +-
 rt/transports/http-netty/netty-server/pom.xml   |   2 +-
 rt/transports/http/pom.xml                      |   2 +-
 rt/transports/jms/pom.xml                       |   2 +-
 rt/transports/local/pom.xml                     |   2 +-
 rt/transports/udp/pom.xml                       |   2 +-
 .../cxf/transport/udp/UDPTransportTest.java     |   2 +-
 rt/transports/websocket/pom.xml                 |   2 +-
 .../AtmosphereWebSocketServletDestination.java  |  20 +-
 rt/ws/addr/pom.xml                              |   2 +-
 rt/ws/eventing/pom.xml                          |   2 +-
 rt/ws/mex/pom.xml                               |   2 +-
 rt/ws/policy/pom.xml                            |   2 +-
 rt/ws/rm/pom.xml                                |   2 +-
 rt/ws/security/pom.xml                          |   2 +-
 .../KerberosTokenInterceptorProvider.java       |   2 -
 .../PolicyBasedWSS4JStaxInInterceptor.java      |   5 +-
 .../wss4j/PolicyStaxActionInInterceptor.java    | 142 --------------
 .../ws/security/wss4j/WSS4JPolicyAsserter.java  |  83 +++++++++
 rt/wsdl/pom.xml                                 |   2 +-
 .../apache/cxf/wsdl11/WSDLServiceBuilder.java   |  50 ++---
 services/pom.xml                                |   2 +-
 services/sts/pom.xml                            |   2 +-
 services/sts/sts-core/pom.xml                   |   2 +-
 .../cxf/sts/operation/TokenIssueOperation.java  |  81 ++++----
 services/sts/sts-war/pom.xml                    |   2 +-
 services/sts/systests/advanced/pom.xml          |   2 +-
 services/sts/systests/basic/pom.xml             |   2 +-
 services/sts/systests/pom.xml                   |   2 +-
 services/ws-discovery/pom.xml                   |   2 +-
 services/ws-discovery/ws-discovery-api/pom.xml  |   2 +-
 .../ws-discovery/ws-discovery-service/pom.xml   |   2 +-
 services/wsn/pom.xml                            |   2 +-
 services/wsn/wsn-api/pom.xml                    |   2 +-
 .../org/apache/cxf/wsn/client/Consumer.java     |   6 +-
 .../org/apache/cxf/wsn/client/Publisher.java    |  19 +-
 .../org/apache/cxf/wsn/util/CXFWSNHelper.java   |  24 ++-
 .../java/org/apache/cxf/wsn/util/WSNHelper.java |  24 +++
 .../resources/org/apache/cxf/wsn/wsdl/wsn.wsdl  |  18 +-
 services/wsn/wsn-core/pom.xml                   |   2 +-
 .../org/apache/cxf/wsn/AbstractEndpoint.java    |   9 +-
 .../org/apache/cxf/wsn/EndpointManager.java     |   4 +-
 .../cxf/wsn/services/JaxwsCreatePullPoint.java  |   4 +-
 .../cxf/wsn/services/JaxwsEndpointManager.java  |  26 ++-
 .../wsn/services/JaxwsNotificationBroker.java   |   4 +-
 .../apache/cxf/wsn/services/JaxwsPublisher.java |   4 +-
 .../apache/cxf/wsn/services/JaxwsPullPoint.java |   6 +-
 .../cxf/wsn/services/JaxwsSubscription.java     |   6 +-
 .../wsn/services/OSGiJaxwsEndpointManager.java  |   6 +-
 .../java/org/apache/cxf/wsn/WsnBrokerTest.java  |   5 +-
 services/wsn/wsn-osgi/pom.xml                   |   2 +-
 services/xkms/pom.xml                           |   2 +-
 services/xkms/xkms-client/pom.xml               |   2 +-
 services/xkms/xkms-common/pom.xml               |   2 +-
 services/xkms/xkms-features/pom.xml             |   2 +-
 services/xkms/xkms-itests/pom.xml               |   2 +-
 services/xkms/xkms-osgi/pom.xml                 |   2 +-
 services/xkms/xkms-service/pom.xml              |   2 +-
 services/xkms/xkms-war/pom.xml                  |   2 +-
 services/xkms/xkms-x509-handlers/pom.xml        |   2 +-
 services/xkms/xkms-x509-repo-ldap/pom.xml       |   2 +-
 systests/cdi/pom.xml                            |   2 +-
 systests/container-integration/grizzly/pom.xml  |   2 +-
 systests/container-integration/pom.xml          |   2 +-
 systests/container-integration/webapp/pom.xml   |   2 +-
 systests/databinding/pom.xml                    |   2 +-
 systests/jaxrs/pom.xml                          |   2 +-
 ...ServerResourceCreatedSpringProviderTest.java |  57 ++++--
 .../jaxrs/JAXRSClientServerSpringBookTest.java  |   2 +-
 .../systest/jaxrs/extraction/BookCatalog.java   |  15 ++
 .../extraction/JAXRSClientServerTikaTest.java   |  24 ++-
 ...RSClientServerWebSocketSpringWebAppTest.java |   8 +-
 .../JAXRSClientServerWebSocketTest.java         |  57 +++---
 systests/jaxws/pom.xml                          |   2 +-
 systests/pom.xml                                |   2 +-
 systests/rs-security/pom.xml                    |   2 +-
 systests/transport-jms/pom.xml                  |   2 +-
 systests/transports/pom.xml                     |   2 +-
 systests/uncategorized/pom.xml                  |   2 +-
 systests/ws-rm/pom.xml                          |   2 +-
 systests/ws-security-examples/pom.xml           |   2 +-
 systests/ws-security/pom.xml                    |   2 +-
 systests/ws-specs/pom.xml                       |   2 +-
 systests/wsdl_maven/codegen/pom.xml             |   2 +-
 systests/wsdl_maven/java2ws/pom.xml             |   2 +-
 systests/wsdl_maven/pom.xml                     |   2 +-
 testutils/pom.xml                               |   2 +-
 tools/common/pom.xml                            |   2 +-
 tools/corba/pom.xml                             |   2 +-
 tools/javato/pom.xml                            |   2 +-
 tools/javato/ws/pom.xml                         |   2 +-
 tools/pom.xml                                   |   2 +-
 tools/validator/pom.xml                         |   2 +-
 tools/wadlto/jaxrs/pom.xml                      |   2 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java |  41 +++--
 .../tools/wadlto/jaxrs/JAXRSContainerTest.java  |  26 +++
 .../wadl/resourceSchemaNoTargetNamespace.xml    |  30 +++
 tools/wadlto/pom.xml                            |   2 +-
 tools/wsdlto/core/pom.xml                       |   2 +-
 tools/wsdlto/databinding/jaxb/pom.xml           |   2 +-
 tools/wsdlto/frontend/javascript/pom.xml        |   2 +-
 tools/wsdlto/frontend/jaxws/pom.xml             |   2 +-
 tools/wsdlto/misc/pom.xml                       |   2 +-
 tools/wsdlto/pom.xml                            |   2 +-
 tools/wsdlto/test/pom.xml                       |   2 +-
 276 files changed, 1872 insertions(+), 1536 deletions(-)
----------------------------------------------------------------------



Mime
View raw message