You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/10/08 11:56:48 UTC
[1/2] git commit: [CXF-6037] Support for java.sql.Time
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes ff823ecd4 -> ee6f81428
[CXF-6037] Support for java.sql.Time
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/68fb8a1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68fb8a1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68fb8a1a
Branch: refs/heads/2.7.x-fixes
Commit: 68fb8a1a8b0268eda80d3972cb6fe345415e1dac
Parents: d2ab3e9
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Oct 8 10:38:29 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Oct 8 10:54:59 2014 +0100
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/68fb8a1a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
index 39ad123..1e5055f 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.ext.search.fiql;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.sql.Time;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.ParseException;
@@ -491,6 +492,8 @@ public class FiqlParser<T> implements SearchConditionParser<T> {
try {
if (Timestamp.class.isAssignableFrom(valueType)) {
return convertToTimestamp(value);
+ } else if (Time.class.isAssignableFrom(valueType)) {
+ return convertToTime(value);
} else {
return convertToDefaultDate(value);
}
@@ -512,6 +515,11 @@ public class FiqlParser<T> implements SearchConditionParser<T> {
Date date = convertToDefaultDate(value);
return new Timestamp(date.getTime());
}
+
+ private Time convertToTime(String value) throws ParseException {
+ Date date = convertToDefaultDate(value);
+ return new Time(date.getTime());
+ }
private Date convertToDefaultDate(String value) throws ParseException {
DateFormat df = SearchUtils.getDateFormat(contextProperties);
[2/2] git commit: Merge branch '2.7.x-fixes' of
https://git-wip-us.apache.org/repos/asf/cxf into 2.7.x-fixes
Posted by se...@apache.org.
Merge branch '2.7.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 2.7.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee6f8142
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee6f8142
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee6f8142
Branch: refs/heads/2.7.x-fixes
Commit: ee6f81428cf492098d7c3b15bc99e490480bd9bf
Parents: 68fb8a1 ff823ec
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Oct 8 10:55:48 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Oct 8 10:55:48 2014 +0100
----------------------------------------------------------------------
.gitmergeinfo | 220 ++++++++++
api/pom.xml | 4 +-
.../org/apache/cxf/common/util/UrlUtils.java | 17 +
.../cxf/common/xmlschema/SchemaCollection.java | 6 +-
.../jsse/TLSParameterJaxBUtils.java | 2 +-
.../cxf/service/invoker/FactoryInvoker.java | 2 +-
.../org/apache/cxf/staxutils/StaxUtils.java | 326 +++++++++++++--
common/pom.xml | 4 +-
common/wstx-msv-validation/pom.xml | 4 +-
common/xerces-xsd-validation/pom.xml | 4 +-
distribution/manifest/pom.xml | 4 +-
distribution/pom.xml | 4 +-
.../src/main/appended-resources/META-INF/NOTICE | 2 +-
distribution/src/main/release/release_notes.txt | 155 +++----
.../src/main/release/samples/aegis/pom.xml | 12 +-
.../release/samples/aegis_standalone/pom.xml | 6 +-
.../src/main/release/samples/callback/pom.xml | 10 +-
.../samples/configuration_interceptor/pom.xml | 12 +-
.../src/main/release/samples/corba/bank/pom.xml | 10 +-
.../samples/corba/bank_ws_addressing/pom.xml | 10 +-
.../release/samples/corba/hello_world/pom.xml | 10 +-
.../samples/groovy_spring_support/pom.xml | 10 +-
.../release/samples/in_jvm_transport/pom.xml | 12 +-
.../release/samples/java_first_jaxws/pom.xml | 8 +-
.../java_first_jaxws_factory_bean/pom.xml | 10 +-
.../main/release/samples/java_first_jms/pom.xml | 8 +-
.../release/samples/java_first_pojo/pom.xml | 10 +-
.../samples/java_first_spring_support/pom.xml | 10 +-
.../main/release/samples/jax_rs/basic/pom.xml | 10 +-
.../release/samples/jax_rs/basic_https/pom.xml | 4 +-
.../samples/jax_rs/content_negotiation/pom.xml | 12 +-
.../release/samples/jax_rs/minimal_osgi/pom.xml | 4 +-
.../samples/jax_rs/spring_security/pom.xml | 10 +-
.../samples/jax_server_aegis_client/pom.xml | 12 +-
.../main/release/samples/jaxws_async/pom.xml | 12 +-
.../samples/jaxws_dispatch_provider/pom.xml | 10 +-
.../main/release/samples/jaxws_handlers/pom.xml | 10 +-
.../src/main/release/samples/jms_pubsub/pom.xml | 10 +-
.../src/main/release/samples/jms_queue/pom.xml | 8 +-
.../main/release/samples/jms_spec_demo/pom.xml | 8 +-
.../release/samples/jms_spring_config/pom.xml | 8 +-
.../js_browser_client_java_first/pom.xml | 12 +-
.../samples/js_browser_client_simple/pom.xml | 12 +-
.../src/main/release/samples/js_client/pom.xml | 12 +-
.../main/release/samples/js_provider/pom.xml | 10 +-
.../main/release/samples/logbrowser/README.txt | 27 +-
.../src/main/release/samples/logbrowser/pom.xml | 86 +++-
.../src/main/java/demo/service/Server.java | 2 +-
.../logbrowser/src/main/webapp/WEB-INF/web.xml | 69 +++
.../src/main/webapp/customer-service.html | 179 ++++++++
.../src/main/webapp/jquery-1.4.2.min.js | 154 +++++++
.../samples/logbrowser/webapp/WEB-INF/web.xml | 69 ---
.../logbrowser/webapp/customer-service.html | 175 --------
.../logbrowser/webapp/jquery-1.4.2.min.js | 154 -------
.../src/main/release/samples/mtom/pom.xml | 10 +-
.../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 | 12 +-
.../release/samples/ruby_spring_support/pom.xml | 10 +-
.../main/release/samples/soap_header/pom.xml | 10 +-
.../src/main/release/samples/sts/pom.xml | 4 +-
.../main/release/samples/ws_addressing/pom.xml | 10 +-
.../main/release/samples/ws_discovery/pom.xml | 12 +-
.../release/samples/ws_notification/pom.xml | 16 +-
.../src/main/release/samples/ws_policy/pom.xml | 10 +-
.../src/main/release/samples/ws_rm/pom.xml | 12 +-
.../samples/ws_security/sign_enc/pom.xml | 18 +-
.../main/release/samples/ws_security/ut/pom.xml | 12 +-
.../samples/ws_security/ut_policy/pom.xml | 4 +-
.../release/samples/ws_security/ut_sign/pom.xml | 18 +-
.../src/main/release/samples/wsdl_first/pom.xml | 8 +-
.../samples/wsdl_first_dynamic_client/pom.xml | 10 +-
.../release/samples/wsdl_first_https/pom.xml | 4 +-
.../release/samples/wsdl_first_pure_xml/pom.xml | 10 +-
.../release/samples/wsdl_first_rpclit/pom.xml | 10 +-
.../release/samples/wsdl_first_soap12/pom.xml | 10 +-
.../samples/wsdl_first_xml_wrapped/pom.xml | 10 +-
.../release/samples/wsdl_first_xmlbeans/pom.xml | 12 +-
integration/jca/pom.xml | 4 +-
integration/pom.xml | 4 +-
.../archetypes/cxf-jaxrs-service/pom.xml | 4 +-
.../archetypes/cxf-jaxws-javafirst/pom.xml | 4 +-
maven-plugins/archetypes/pom.xml | 4 +-
maven-plugins/codegen-plugin/pom.xml | 4 +-
maven-plugins/corba/pom.xml | 4 +-
maven-plugins/java2wadl-plugin/pom.xml | 4 +-
maven-plugins/java2ws-plugin/pom.xml | 4 +-
maven-plugins/pom.xml | 4 +-
maven-plugins/wadl2java-plugin/pom.xml | 4 +-
maven-plugins/wsdl-validator-plugin/pom.xml | 4 +-
osgi/bundle/all/pom.xml | 4 +-
osgi/bundle/compatible/pom.xml | 4 +-
osgi/bundle/jaxrs/pom.xml | 10 +-
osgi/bundle/minimal/pom.xml | 4 +-
osgi/bundle/pom.xml | 4 +-
osgi/itests/pom.xml | 1 -
osgi/karaf/commands/pom.xml | 2 +-
osgi/karaf/features/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 13 +
osgi/karaf/pom.xml | 4 +-
parent/pom.xml | 23 +-
pom.xml | 6 +-
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 +-
.../soap/interceptor/Messages.properties | 2 +-
.../interceptor/ReadHeadersInterceptor.java | 226 +++++++---
rt/bindings/xml/pom.xml | 2 +-
rt/core/pom.xml | 4 +-
.../java/org/apache/cxf/bus/ManagedBus.java | 8 +-
.../org/apache/cxf/bus/extension/Extension.java | 19 +-
.../cxf/bus/extension/ExtensionManagerImpl.java | 71 ++--
rt/databinding/aegis/pom.xml | 2 +-
rt/databinding/jaxb/pom.xml | 2 +-
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 24 +-
rt/databinding/jibx/pom.xml | 2 +-
rt/databinding/sdo/pom.xml | 2 +-
rt/databinding/xmlbeans/pom.xml | 2 +-
rt/features/clustering/pom.xml | 4 +-
rt/frontend/jaxrs/pom.xml | 4 +-
.../apache/cxf/jaxrs/client/AbstractClient.java | 6 +
.../cxf/jaxrs/client/ClientProxyImpl.java | 8 +-
.../jaxrs/client/JAXRSClientFactoryBean.java | 34 +-
.../jaxrs/client/UrlEncodingParamConverter.java | 70 ++++
.../org/apache/cxf/jaxrs/client/WebClient.java | 2 +-
.../cxf/jaxrs/impl/RequestPreprocessor.java | 6 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 3 +
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 132 +++++-
.../cxf/jaxrs/provider/BinaryDataProvider.java | 59 ++-
.../cxf/jaxrs/provider/ProviderFactory.java | 2 +-
.../cxf/jaxrs/provider/SourceProvider.java | 72 ++--
.../apache/cxf/jaxrs/utils/ExceptionUtils.java | 2 +-
.../org/apache/cxf/jaxrs/utils/HttpUtils.java | 9 +-
.../apache/cxf/jaxrs/utils/InjectionUtils.java | 21 +-
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 3 +-
.../apache/cxf/jaxrs/impl/UriInfoImplTest.java | 5 +
.../apache/cxf/jaxrs/model/wadl/BookStore.java | 25 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 11 +-
.../jaxrs/provider/BinaryDataProviderTest.java | 11 +
rt/frontend/jaxws/pom.xml | 4 +-
.../interceptors/MessageModeOutInterceptor.java | 18 +-
rt/frontend/js/pom.xml | 4 +-
rt/frontend/simple/pom.xml | 4 +-
.../org/apache/cxf/frontend/WSDLGetUtils.java | 4 +-
rt/javascript/javascript-rt/pom.xml | 2 +-
rt/javascript/javascript-tests/pom.xml | 2 +-
rt/javascript/pom.xml | 2 +-
rt/management-web/pom.xml | 23 +-
.../settings/RemoteStorageProxyImpl.java | 2 +-
.../client/ui/browser/ViewerViewImpl.java | 16 +-
.../cxf/management/web/logging/MockApp.java | 6 +-
rt/management/pom.xml | 4 +-
rt/pom.xml | 4 +-
.../jaxrs/client/UrlEncodingParamConverter.java | 70 ++++
rt/rs/extensions/providers/pom.xml | 4 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 8 +
.../jaxrs/provider/json/JSONProviderTest.java | 156 ++++++-
.../jaxrs/provider/json/WadlGeneratorTest.java | 10 +-
rt/rs/extensions/search/pom.xml | 4 +-
rt/rs/security/cors/pom.xml | 4 +-
rt/rs/security/oauth-parent/oauth/pom.xml | 4 +-
rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 4 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 4 +-
rt/rs/security/oauth-parent/pom.xml | 4 +-
rt/rs/security/sso/saml/pom.xml | 4 +-
.../saml/sso/EHCacheTokenReplayCache.java | 2 +-
.../saml/sso/SAMLProtocolResponseValidator.java | 14 +-
.../saml/sso/SAMLSSOResponseValidator.java | 5 +-
.../saml/sso/state/EHCacheSPStateManager.java | 2 +-
.../saml/sso/SAMLResponseValidatorTest.java | 9 +-
rt/rs/security/xml/pom.xml | 4 +-
rt/security/pom.xml | 2 +-
rt/transports/http-hc/pom.xml | 4 +-
.../http/asyncclient/AsyncHTTPConduit.java | 31 +-
.../asyncclient/AsyncHTTPConduitFactory.java | 32 +-
rt/transports/http-jetty/pom.xml | 4 +-
.../http_jetty/JettyHTTPServerEngine.java | 33 +-
.../JettyHTTPServerEngineFactory.java | 3 +-
.../http_jetty/ThreadingParameters.java | 16 +
.../JettyHTTPServerEngineFactoryHolder.java | 1 +
.../osgi/HTTPJettyTransportActivator.java | 2 +
...ttyHTTPServerEngineBeanDefinitionParser.java | 3 +
.../spring/JettySpringTypesFactory.java | 1 +
.../schemas/configuration/http-jetty.xsd | 5 +
.../http_jetty/JettyHTTPServerEngineTest.java | 61 ++-
.../spring/ApplicationContextTest.java | 6 +-
.../transport/http_jetty/spring/bean.properties | 1 +
.../transport/http_jetty/spring/beans-props.xml | 80 ++--
.../cxf/transport/http_jetty/spring/beans.xml | 79 ++--
rt/transports/http/pom.xml | 4 +-
.../apache/cxf/transport/http/HTTPConduit.java | 4 +-
.../http/auth/AbstractSpnegoAuthSupplier.java | 11 +-
.../auth/WSDLGetAuthenticatorInterceptor.java | 138 ++++++
.../OSGI-INF/blueprint/osgiservlet.xml | 9 +-
rt/transports/jms/pom.xml | 4 +-
rt/transports/local/pom.xml | 4 +-
rt/transports/udp/pom.xml | 4 +-
rt/ws/addr/pom.xml | 2 +-
rt/ws/mex/pom.xml | 2 +-
rt/ws/policy/pom.xml | 2 +-
.../cxf/ws/policy/EndpointPolicyImpl.java | 8 +-
.../cxf/ws/policy/EndpointPolicyImplTest.java | 16 +
rt/ws/rm/pom.xml | 2 +-
rt/ws/security/pom.xml | 2 +-
.../cxf/ws/security/SecurityConstants.java | 38 +-
.../ws/security/cache/EHCacheManagerHolder.java | 2 +-
.../ws/security/kerberos/KerberosClient.java | 46 +-
.../cxf/ws/security/kerberos/KerberosUtils.java | 13 +
.../security/policy/WSSecurityPolicyLoader.java | 6 +
.../IssuedTokenInterceptorProvider.java | 9 +-
.../SecureConversationInInterceptor.java | 187 +++++----
.../ws/security/tokenstore/SecurityToken.java | 14 +
.../ws/security/trust/AbstractSTSClient.java | 7 +-
.../apache/cxf/ws/security/trust/STSUtils.java | 55 +--
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 1 +
.../ws/security/wss4j/SamlTokenInterceptor.java | 17 +-
.../ws/security/wss4j/WSS4JInInterceptor.java | 137 +++---
.../policyhandlers/TransportBindingHandler.java | 5 +
.../AbstractBindingPolicyValidator.java | 42 +-
.../policyvalidators/LayoutPolicyValidator.java | 3 +-
.../X509TokenPolicyValidator.java | 71 +++-
.../tokenstore/MemoryTokenStoreTest.java | 13 +
.../ws/security/wss4j/AbstractSecurityTest.java | 6 +-
.../wss4j/saml/CustomSamlValidator.java | 12 +-
.../wss4j/saml/PolicyBasedSamlTest.java | 38 ++
.../ws/security/wss4j/saml/SamlTokenTest.java | 55 ++-
.../src/test/resources/saml_bearer.properties | 6 +
services/pom.xml | 4 +-
services/sts/pom.xml | 4 +-
services/sts/sts-core/pom.xml | 9 +-
.../java/org/apache/cxf/sts/claims/Claim.java | 109 ++++-
.../apache/cxf/sts/claims/ClaimsManager.java | 6 +-
.../cxf/sts/claims/mapper/ClaimUtils.java | 417 +++++++++++++++++++
.../cxf/sts/claims/mapper/JexlClaimsMapper.java | 108 +++++
.../cxf/sts/event/map/MapEventLogger.java | 6 +-
.../token/provider/DefaultSubjectProvider.java | 6 +-
.../sts/claims/mapper/JexlClaimsMapperTest.java | 257 ++++++++++++
.../org/apache/cxf/sts/common/ClaimTest.java | 132 ++++++
.../token/provider/SAMLProviderActAsTest.java | 17 +-
.../jexlClaimMappingsWithFunctions.script | 80 ++++
.../jexlClaimMappingsWithoutFunctions.script | 169 ++++++++
services/sts/sts-war/pom.xml | 2 +-
services/sts/systests/advanced/pom.xml | 2 +-
.../cxf/systest/sts/caching/CachingTest.java | 44 ++
.../sts/kerberos/DoubleItPortTypeImpl.java | 50 +++
.../cxf/systest/sts/kerberos/Intermediary.java | 46 ++
.../sts/kerberos/IntermediaryPortTypeImpl.java | 90 ++++
.../kerberos/JAXRSIntermediaryPortTypeImpl.java | 77 ++++
.../kerberos/KerberosDelegationTokenTest.java | 136 ++++++
.../systest/sts/kerberos/KerberosTokenTest.java | 2 +-
.../sts/kerberos/DoubleItIntermediary.wsdl | 142 +++++++
.../sts/kerberos/cxf-intermediary-client.xml | 48 +++
.../kerberos/cxf-intermediary-jaxrs-client.xml | 43 ++
.../systest/sts/kerberos/cxf-intermediary.xml | 112 +++++
.../cxf/systest/sts/kerberos/cxf-service.xml | 61 ++-
.../apache/cxf/systest/sts/kerberos/jaxrs.xml | 26 ++
services/sts/systests/basic/pom.xml | 2 +-
.../cxf/systest/sts/bearer/BearerTest.java | 66 ---
.../sts/delegation/SAMLDelegationTest.java | 399 ++++++++++++++++++
.../cxf/systest/sts/delegation/STSServer.java | 46 ++
.../systest/sts/stsclient/STSClientTest.java | 119 ++++++
.../cxf/systest/sts/stsclient/Server.java | 46 ++
.../cxf/systest/sts/delegation/cxf-client.xml | 38 ++
.../sts/delegation/cxf-sts-transport.xml | 150 +++++++
.../sts/delegation/ws-trust-1.4-service.wsdl | 348 ++++++++++++++++
.../cxf/systest/sts/stsclient/DoubleIt.wsdl | 236 +++++++++++
.../systest/sts/stsclient/cxf-client-name.xml | 58 +++
.../sts/stsclient/cxf-default-client.xml | 58 +++
.../cxf/systest/sts/stsclient/cxf-service.xml | 49 +++
services/sts/systests/pom.xml | 4 +-
services/ws-discovery/pom.xml | 4 +-
services/ws-discovery/ws-discovery-api/pom.xml | 16 +-
.../ws-discovery/ws-discovery-service/pom.xml | 4 +-
services/wsn/pom.xml | 4 +-
services/wsn/wsn-api/pom.xml | 4 +-
services/wsn/wsn-core/pom.xml | 4 +-
services/wsn/wsn-osgi/pom.xml | 4 +-
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 | 16 +-
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 +-
systests/container-integration/grizzly/pom.xml | 4 +-
systests/container-integration/pom.xml | 4 +-
systests/container-integration/webapp/pom.xml | 4 +-
systests/databinding/pom.xml | 4 +-
systests/jaxrs/pom.xml | 4 +-
.../apache/cxf/systest/jaxrs/BookServer20.java | 20 +
.../org/apache/cxf/systest/jaxrs/BookStore.java | 34 +-
.../jaxrs/JAXRS20ClientServerBookTest.java | 18 +
.../jaxrs/JAXRSClientServerBookTest.java | 50 ++-
systests/jaxws/pom.xml | 4 +-
systests/pom.xml | 4 +-
systests/rs-security/pom.xml | 4 +-
.../jaxrs/security/oauth2/JAXRSOAuth2Test.java | 2 +-
.../security/oauth2/SamlCallbackHandler2.java | 3 +
systests/transport-jms/pom.xml | 4 +-
systests/transports/pom.xml | 4 +-
systests/uncategorized/pom.xml | 4 +-
systests/ws-rm/pom.xml | 4 +-
systests/ws-security-examples/pom.xml | 4 +-
.../wssec/examples/saml/server/server.xml | 8 +-
systests/ws-security/pom.xml | 4 +-
.../cxf/systest/ws/action/ActionTest.java | 24 ++
.../cxf/systest/ws/saml/SamlTokenTest.java | 32 +-
.../ws/saml/client/SamlCallbackHandler.java | 23 +-
.../ws/saml/server/CustomSaml2Validator.java | 10 +-
.../saml/subjectconf/SamlSubjectConfTest.java | 403 ++++++++++++++++++
.../cxf/systest/ws/saml/subjectconf/Server.java | 47 +++
.../apache/cxf/systest/ws/wssc/WSSCTest.java | 41 +-
.../client/KeystorePasswordCallback.java | 2 +
.../cxf/systest/ws/x509/X509TokenTest.java | 1 +
.../src/test/resources/morpit.properties | 21 +
.../cxf/systest/ws/action/DoubleItAction.wsdl | 3 +
.../systest/ws/action/DoubleItActionPolicy.wsdl | 113 +++++
.../org/apache/cxf/systest/ws/action/client.xml | 33 +-
.../org/apache/cxf/systest/ws/action/server.xml | 23 +
.../cxf/systest/ws/saml/DoubleItSaml.wsdl | 4 +
.../cxf/systest/ws/saml/client/client.xml | 1 +
.../cxf/systest/ws/saml/server/server.xml | 6 +-
.../subjectconf/DoubleItSamlSubjectConf.wsdl | 106 +++++
.../systest/ws/saml/subjectconf/client-auth.xml | 40 ++
.../ws/saml/subjectconf/client-noauth.xml | 37 ++
.../cxf/systest/ws/saml/subjectconf/server.xml | 60 +++
.../cxf/systest/ws/x509/DoubleItX509.wsdl | 1 +
systests/ws-specs/pom.xml | 4 +-
systests/wsdl_maven/codegen/pom.xml | 4 +-
systests/wsdl_maven/java2ws/pom.xml | 4 +-
systests/wsdl_maven/pom.xml | 4 +-
testutils/pom.xml | 14 +-
tools/common/pom.xml | 4 +-
tools/corba/pom.xml | 4 +-
tools/javato/pom.xml | 4 +-
tools/javato/ws/pom.xml | 4 +-
.../cxf/tools/fortest/exception/Echo4.java | 26 ++
.../exception/TransientMessageException.java | 60 +++
.../processor/JavaToProcessorTest.java | 59 +++
tools/pom.xml | 4 +-
tools/validator/pom.xml | 4 +-
tools/wadlto/jaxrs/pom.xml | 4 +-
.../cxf/tools/wadlto/WadlToolConstants.java | 1 +
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 18 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 242 ++++++++---
.../tools/wadlto/jaxrs/ValidationException.java | 30 ++
.../cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml | 42 +-
.../src/main/resources/schemas/wadl/wadl.xsd | 263 ++++++++++++
.../tools/wadlto/jaxrs/JAXRSContainerTest.java | 33 +-
.../tools/wadlto/jaxrs/ValidateWadlTest.java | 21 +-
.../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 5 +-
.../jaxrs/src/test/resources/wadl/bookstore.xml | 2 +-
.../src/test/resources/wadl/invalidWadl.xml | 13 +
.../jaxrs/src/test/resources/wadl/test.xml | 21 +-
tools/wadlto/pom.xml | 4 +-
tools/wsdlto/core/pom.xml | 4 +-
tools/wsdlto/databinding/jaxb/pom.xml | 4 +-
tools/wsdlto/frontend/javascript/pom.xml | 4 +-
tools/wsdlto/frontend/jaxws/pom.xml | 4 +-
.../customization/CustomizationParser.java | 1 -
tools/wsdlto/misc/pom.xml | 4 +-
tools/wsdlto/pom.xml | 4 +-
tools/wsdlto/test/pom.xml | 4 +-
368 files changed, 9083 insertions(+), 1927 deletions(-)
----------------------------------------------------------------------